valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,778 Commits 24 Branches 182 Tags 341 MiB
fec6b2716b
Commit Graph

3100 Commits

Author SHA1 Message Date
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
C. R. Oldham
5caf4e35c9 Merge pull request #15098 from s0undt3ch/issues/14979-output-file-permissions 
Trim the output file as opposed to delete to keep same permissions.
 2014-08-20 11:16:42 -06:00
rallytime
e7a09640fa put -C tar command back in 2014-08-20 10:07:12 -06:00
rallytime
286de2466d Remove compound matching from jenkins.py 2014-08-20 09:49:49 -06:00
rallytime
2285a10a95 Use salt.utils.odict instead of python2.7 OrderedDict 2014-08-20 09:24:52 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions 
Refs #14979
 2014-08-20 02:28:13 +01:00
Mike Place
8e3b01f17e Merge pull request #15013 from felskrone/add_tcp_dumper_script 
Add tcp dumper script
 2014-08-19 13:26:42 -06:00
Nicole Thomas
37420dfed3 Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures 
Boto vpc boto secgroup resolve unit test failures
 2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664 skip if mock not found 2014-08-19 16:19:41 +00:00
Pedro Algarvio
8baf773b78 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-18 05:37:27 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
vs
d1599b4780 more linting 2014-08-16 09:24:46 +02:00
vs
bae8d39bb1 lint fixes 2014-08-16 09:01:16 +02:00
Thomas S Hatch
02da0dda32 Merge pull request #15016 from whiteinge/netapi-fix-logout 
Add tests and a fix for the rest_cherrypy logout view
 2014-08-15 23:20:35 -06:00
Thomas S Hatch
fff64b37ab Merge pull request #14975 from jhenry82/issue_14304 
Issue 14304: add proxy parameter to gem.installed state
 2014-08-15 23:12:08 -06:00
Gavin Swanson
4eaa601f3c Added update and uninstall functions 
Should be able to remove and update things now. Also doesn't always
update when installing anymore. Update now only called via
salt['cyg.update']()
 2014-08-15 20:17:40 -07:00
Colin Johnson
72b9ebe304 move to LooseVersion for Boto version testing 2014-08-15 23:05:05 +00:00
Colin Johnson
c3a6f3d727 fix boto versions for boto_secgroup and boto_vpc 2014-08-15 22:57:44 +00:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Gavin Swanson
c8d19409f6 Add cygwin package installation 
Currently only hadles adding packages. Does not remove packages. It is
setup to update packages any time it is run, but there is no independent
update functionality.
Curently no unit/integration testing is done. I haven't wrapped my head
around the way the mocking and stuff is done yet.
 2014-08-15 14:13:22 -07:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
Colin Johnson
86bcea16ee resolve issue with boto < 2.4.0 GroupOrCIDR attributes 2014-08-15 18:58:26 +00:00
rallytime
396a4de7c5 Make lxc tests run! 2014-08-15 11:09:20 -06:00
Seth House
2b5bed43b9 Add integration test for logging out of the rest_cherrypy app 2014-08-15 09:45:30 -04:00
vs
12bc275388 fix mail address 2014-08-15 13:17:19 +02:00
vs
c26e50e694 more linting 2014-08-15 13:05:42 +02:00
vs
b175b705ce pylinting and cleanup 2014-08-15 13:03:26 +02:00
vs
11f544b3ba fix missing brace 2014-08-15 12:15:49 +02:00
vs
0ad1f016ed add tcp-dumper for visualzing salt-master network activity 2014-08-15 12:11:50 +02:00
Thomas S Hatch
2305a89aae Merge pull request #14986 from steverweber/slspath_fix 
include trailing slash for slspath template var
 2014-08-14 23:55:55 -06:00
rallytime
e8fab3d28a Fix psutil version 2014-08-14 21:22:55 -06:00
rallytime
0683c704dd Move psutil version check 2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044 resolve issue with Ubuntu 12.0.4 failures 2014-08-15 01:12:43 +00:00
rallytime
8dca2515ee Skip virtual_memory and swap_memory tests if psutil < 0.6.0 2014-08-14 16:16:38 -06:00
Pedro Algarvio
9134a69dc1 Merge pull request #14990 from rallytime/gitpillar_tests 
Fix gitpillar skipIfs
 2014-08-14 18:44:29 +01:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
steve
091c40df21 save 2014-08-14 12:40:27 -04:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
Jon Henry
c065ac4f50 Fix gem unit test with new proxy parameter 2014-08-14 00:22:52 -06:00
Seth House
e2ed04351d Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/modules/npm.py
 2014-08-13 18:56:23 -04:00
Thomas S Hatch
a0d7163abb Merge pull request #14967 from rallytime/pillar_tests 
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
 2014-08-13 16:53:56 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
rallytime
f9e481e49d Add needs_daemon=False to run_tests 2014-08-12 16:57:34 -06:00
rallytime
b579247646 Add no_mock/_reason and ensure_in_syspath 2014-08-12 16:48:01 -06:00
rallytime
a0233b3ebf Fix pillar mysql test formatting 2014-08-12 16:44:33 -06:00
Colton Myers
19cf82fd5f Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/transports/raet/index.rst
	salt/minion.py
 2014-08-12 14:15:50 -06:00
Thomas S Hatch
1a5c0c5dca Merge pull request #14895 from whiteinge/npm-cleanup 
Fix npm test; npm state pylint fix
 2014-08-12 11:44:42 -06:00
rallytime
d57fc99bca Move mock_ec2 decorator back to functions 2014-08-12 09:20:17 -06:00
rallytime
5fff2f9b3f Rename boto tests files to include '_test' at the end 2014-08-11 17:01:42 -06:00
Nicole Thomas
64ee26aa57 Merge pull request #14897 from rallytime/boto_test_fixes 
Update imports and skipIfs on boto unit tests
 2014-08-11 17:01:01 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Pedro Algarvio
09acfae48e Bring the global variables more into their context 2014-08-11 22:25:21 +01:00
rallytime
cc5c3bc1ad Update imports and skipIfs on boto unit tests 2014-08-11 12:57:45 -06:00
Chris Rebert
7da0f0a8b6 fix "retreived" typos 2014-08-11 11:52:30 -07:00
Chris Rebert
b7ce0dbe60 more typos after disabling case-sensitivity 2014-08-11 10:57:41 -07:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Thomas S Hatch
787827618b Merge branch '2014.7' into develop 2014-08-11 11:43:33 -06:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Pedro Algarvio
7b2126c550 Make pylint ignore "non issues" 2014-08-10 06:06:41 +01:00
Pedro Algarvio
9ebe6f3873 Test exc_info per handler 2014-08-10 03:44:53 +01:00
Thomas S Hatch
b166b0c7c1 Merge branch '2014.7' into develop 2014-08-08 15:48:01 -06:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Thomas S Hatch
b0561a703b Revert "Pull out pending_events changes and reuse" 
This reverts commit e832a3a17f.
 2014-08-08 12:49:46 -06:00
Pedro Algarvio
c9be462f00 Skip tests if real mock library is not available 2014-08-08 00:52:47 +01:00
Pedro Algarvio
a399e62ca2 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
97f1b00818 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
faf3157637 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
21141af46a Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
239b2480ae Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	doc/topics/development/conventions/formulas.rst
 2014-08-07 15:51:49 -04:00
Seth House
429cc40376 Minor checks to the saltsh.py repl 2014-08-07 14:24:30 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
Thomas S Hatch
d6e3e31a22 lint fixes 2014-08-05 12:08:05 -06:00
Colin Johnson
d26b671b00 add vpc support in boto_secgroup execution module 2014-08-05 03:45:00 +00:00
Thomas S Hatch
d279889abf Merge pull request #14701 from lyft/asg-support-security-group-names 
boto_asg - add support for use of security group names in launch configs
 2014-08-04 10:57:06 -06:00
Thomas S Hatch
77d709a29c Merge pull request #14601 from lyft/provide-vpc-exists-support 
Provide vpc exists support
 2014-08-04 10:16:38 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop 
Conflicts:
	salt/runners/manage.py
 2014-08-01 10:52:52 -06:00
Colton Myers
2bfcbe01d0 Merge pull request #14661 from rallytime/fix_rhel7_test 
Add GPG key file to integration tests
 2014-07-31 16:34:47 -06:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-31 12:23:38 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Pedro Algarvio
586642576a Add another which only changes the noc 2014-07-30 19:34:00 +01:00
Pedro Algarvio
a53ca96c76 Add another example for version comparison 2014-07-30 19:34:00 +01:00
Pedro Algarvio
4ccb73abac Add another version example to the tests 2014-07-30 19:33:59 +01:00
Pedro Algarvio
b24e1b9c49 Support a minor bugfix attribute in the version string 2014-07-30 19:33:59 +01:00
Pedro Algarvio
3a16b42eb9 Add another which only changes the noc 2014-07-30 18:10:22 +01:00
Pedro Algarvio
7a77942a82 Add another example for version comparison 2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9 Add another version example to the tests 2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338 Support a minor bugfix attribute in the version string 2014-07-30 18:10:02 +01:00
Colin Johnson
3bcfd4bb0d unit tests for boto_vpc module 2014-07-30 07:29:45 +00:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04:00
Thomas S Hatch
aeda9730ca Merge pull request #14460 from steverweber/fix_restarts 
fix issues with keepalive minion
 2014-07-25 21:46:01 -06:00
Seth House
d7d8beabb8 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-25 19:55:43 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config 
Load netapi modules using client config instead of master config
 2014-07-25 15:49:02 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config" 
This partially reverts commit 2bc1ed8afb.
 2014-07-25 14:42:19 -06:00
Thomas S Hatch
263ed1ad90 Merge pull request #14503 from robmessick/gem_state_prereleases 
Add support for pre_releases argument to the gem state
 2014-07-25 14:26:20 -06:00
Thomas S Hatch
641eaa7b03 Merge pull request #14298 from mbirtwell/dont_drop_events_during_gather_job_info 
Dont drop events during gather job info
 2014-07-25 14:04:44 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation 
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
 2014-07-25 14:04:03 -06:00
Rob Messick
4549ef25a2 Add support for pre_releases argument to the gem state 2014-07-25 12:30:42 -07:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
a00e84b556 Merge branch '2014.7' into develop 2014-07-25 12:55:42 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax 
Yay!
 2014-07-25 12:27:45 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Colton Myers
e7bd8bf00d Merge branch '2014.7' into develop 2014-07-25 10:43:55 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
Thomas S Hatch
558e2283d1 Merge pull request #14474 from robmessick/issue14469 
add optional pre_releases argument to gem.install
 2014-07-25 10:34:38 -06:00
Thomas S Hatch
8e0d8a7b9f Merge branch '2014.7' into develop 2014-07-25 10:30:07 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr 
Skip test on Darwin after making an effort
 2014-07-25 10:20:10 -06:00
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -07:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config 
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
 2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
Seth House
fed58155bc Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-24 16:04:39 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Pedro Algarvio
ea01af39b4 Skip test on Darwin after making an effort 2014-07-24 13:12:46 +01:00
Colin Johnson
c8e8bf1577 LYFT-14491 - unit tests for rule modification 2014-07-23 22:59:38 +00:00
Colin Johnson
2ad52a5c06 LYFT-14491 - states unit test for rule modification 2014-07-23 22:59:28 +00:00
rallytime
9b9a60efea Skip vt_test in os x - still needs some work to run 2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476 Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr 
Allow the VT tests to run on OSX
 2014-07-23 14:38:58 -06:00
Pedro Algarvio
6c7e39dfcd Factor out into a function the current number of PTY's detection code 2014-07-23 19:43:18 +01:00
rallytime
51c7b95e6f Give rhel5 a chance to pass the cache tests 2014-07-22 15:38:54 -06:00
rallytime
a3da60def4 Remove unnecessary print statement 2014-07-22 12:16:39 -06:00
Pedro Algarvio
fa2149e1da Allow the VT tests to run on OSX 2014-07-22 15:20:03 +01:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
rallytime
73b185cb72 Allow OSX to run tests with change to TMPDIR 2014-07-21 14:26:59 -06:00
rallytime
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -06:00
Thomas S Hatch
ef277feba1 Merge pull request #14314 from cachedout/grains_raet 
Increase timeout for grains test
 2014-07-17 15:51:37 -06:00
Thomas S Hatch
5a8a5c3485 Merge pull request #14300 from pass-by-value/more_matcher_test_fixes 
Ensure tests pass on raet and zmq
 2014-07-17 14:19:39 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Michael Birtwell
e832a3a17f Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-17 13:18:30 +01:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
Colton Myers
11bfbd7a85 Merge pull request #14272 from rallytime/deprecate_check_dns 
Deprecate check_dns
 2014-07-16 11:44:32 -06:00
rallytime
dfb8894e6a Remove unused imports 2014-07-16 06:41:28 -06:00
rallytime
6733f45924 Removed deprecated references to check_dns 2014-07-16 06:26:08 -06:00
rallytime
1c3737a883 Remove remaining references and tests to no_site_packages 2014-07-16 06:00:08 -06:00
rallytime
4d329296b0 Remove unused import 2014-07-15 18:15:58 -06:00
rallytime
534f3df900 Remove test for no_site_packages deprecation 2014-07-15 17:28:40 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
Mike Place
6b572eaa4b Merge pull request #14253 from pass-by-value/matcher_test_raet_compat 
Matcher test raet compat
 2014-07-15 14:53:57 -06:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Nicole Thomas
6a5f00c3ce Merge pull request #14244 from rallytime/fix_cache_tests 
Change python asserts to unittest asserts
 2014-07-15 13:10:19 -06:00
Thomas S Hatch
da8612ddcc Merge pull request #14243 from cachedout/masterswarm 
Refactor into base swarm and master/minion swarm
 2014-07-15 12:22:46 -06:00
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
Mike Place
200ef6b642 Refactor into base swarm and master/minion swarm 2014-07-15 11:31:07 -06:00
Thomas S Hatch
25a4df3566 Merge pull request #14238 from rallytime/fix_spelling 
Fix spelling error: doctring -> docstring
 2014-07-15 10:41:16 -06:00
Thomas S Hatch
4e91eee9ca Merge pull request #14228 from terminalmage/issue13873 
Fix regression in templating local files
 2014-07-15 10:38:45 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
Leonids Maslovs
6c3973ec05 WIP 13793 Unit tests fixed 2014-07-15 13:19:07 +03:00
David Boucha
8bddefc53b Merge pull request #14229 from whiteinge/rest_cherrypy-run-sessions 
Add rest_cherrypy tests for the /run entrypoint; fix session reference when sessions are disabled
 2014-07-15 02:12:15 -06:00
Seth House
63be4efae9 Added basic smoke-tests for the rest_cherrypy /run entrypoint 2014-07-14 22:11:20 -06:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests 
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
 2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Seth House
2dad062f8a Move rest_cherrypy mocked methods into individual tests 2014-07-14 20:18:21 -06:00
Pedro Algarvio
850e38d9eb Ignore W0221 2014-07-15 01:44:03 +01:00
Pedro Algarvio
698784d1e7 White-space lint fix 2014-07-15 01:43:52 +01:00
Thomas S Hatch
778f3aa55d Merge pull request #14218 from cachedout/masterswarm 
Basic master support for minionswarm
 2014-07-14 17:15:04 -06:00
Seth House
c25e658420 Use the test suite __opts__ instead of custom dict 
Better approach now that we're in Salt core.
 2014-07-14 17:09:25 -06:00
Mike Place
83ce730ec2 Basic master support for minionswarm 2014-07-14 16:59:44 -06:00
Thomas S Hatch
09f5ad951b Merge pull request #14210 from pass-by-value/raet_key_test_refactor 
Refactor salt key tests to be raet compatible
 2014-07-14 16:07:43 -06:00
Thomas S Hatch
8435329d91 Merge pull request #14209 from cachedout/master_config 
Small refactor
 2014-07-14 16:06:09 -06:00
Thomas S Hatch
181dfdfb75 Merge pull request #14202 from cachedout/env_test_remove 
pip test fixup and module cleanup
 2014-07-14 16:00:56 -06:00
Mike Place
457a33d633 Fix test errors 2014-07-14 13:46:45 -06:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Pedro Algarvio
7862600683 Remove syslog-ng tests. Refs #14163 2014-07-13 00:09:45 +01:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Pedro Algarvio
1772b40ecd Merge pull request #14139 from rallytime/batch_test 
A couple of batch unit tests
 2014-07-12 00:06:40 +01:00
rallytime
010f942dc8 Pylint fix, again. 2014-07-11 16:02:06 -06:00
Thomas S Hatch
1e5a545c8c Merge pull request #14137 from mgwilliams/lxc 
lxc refactor
 2014-07-11 16:00:06 -06:00
rallytime
2523d8c641 Mock LocalClient in batch unit tests 2014-07-11 15:38:34 -06:00
Thomas S Hatch
da2f3543fd Skip gitfs tests 
These are running in an incosistent way, all of our local tests pass
 2014-07-11 15:17:58 -06:00
rallytime
c61a1eeb20 Pylint fix 2014-07-11 14:09:24 -06:00
rallytime
2783249931 Remove line 2014-07-11 13:55:56 -06:00
rallytime
bc155127a3 A couple of batch unit tests 2014-07-11 13:54:35 -06:00
Matthew Williams
71e1522c08 WIP: continue restructure of modules.lxc 2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551 WIP: lxc restructure 2014-07-11 18:28:37 +00:00
Thomas S Hatch
2ca17d451a me english so fail 2014-07-10 16:11:00 -06:00
Thomas S Hatch
d2eaad22eb Merge pull request #14100 from cachedout/test_exit 
Clean keyboard exit in test suite
 2014-07-10 14:39:14 -06:00
Thomas S Hatch
e5fe94227f Merge pull request #14097 from mgwilliams/lxc 
add lxc integration tests
 2014-07-10 13:31:17 -06:00
Mike Place
12f851ec3a Clean keyboard exit in test suite 2014-07-10 12:52:43 -06:00
Matthew Williams
e102a95b84 use a faster template (sshd) for lxc integration tests 2014-07-10 14:38:28 -04:00
Matthew Williams
298d4e6eac add lxc integration tests 2014-07-10 13:37:48 -04:00
Thomas S Hatch
9bcadf3c9a Merge pull request #14033 from ihrwein/add-syslog-ng-module 
Add syslog-ng state and execution module
 2014-07-10 10:09:37 -06:00
Thomas S Hatch
af5f42a370 Merge pull request #14069 from rallytime/batch_test 
Simple integration test for batch cli command
 2014-07-10 10:06:19 -06:00
rallytime
0000859eb1 pylint fix 2014-07-09 22:31:54 -06:00
rallytime
9eae34c935 Merge branch 'batch_test' of https://github.com/rallytime/salt into batch_test 2014-07-09 22:01:21 -06:00
rallytime
1acf3ac3a9 Fix batch test 2014-07-09 22:00:41 -06:00
Pedro Algarvio
77aeefe261 Fix dest value 2014-07-10 00:41:26 +01:00
Pedro Algarvio
29fae98470 Merge pull request #14072 from terminalmage/refine-gitfs-tests 
Refine gitfs tests
 2014-07-10 00:02:28 +01:00
rallytime
1df0c20d97 Pyling fixes 2014-07-09 16:22:00 -06:00
Erik Johnson
1fd16fa434 Refine gitfs tests 
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
 2014-07-09 16:06:36 -06:00
rallytime
56279770a9 Simple integration test to execute a batch command to help catch regressions 2014-07-09 15:41:18 -06:00
rallytime
e8fde1b125 Add cli option for batch tests to runtests.py 2014-07-09 15:16:13 -06:00
btibi
851ce0fde4 Add syslog_ng execution module. 2014-07-09 22:42:36 +02:00
btibi
f69977d3e5 Add syslog_ng state module. 2014-07-09 22:04:13 +02:00
Thomas S Hatch
ccb4f1e1e8 Merge pull request #14059 from rallytime/schedule_tests 
One more unit test for utils.schedule
 2014-07-09 12:45:05 -06:00
rallytime
c5c841750a Raise ValueError instead of returning in utils.schedule.eval 2014-07-09 11:59:31 -06:00
btibi
9eeed00382 ps: add partial psutil 2.0 compatibility 2014-07-09 19:54:25 +02:00
Thomas S Hatch
a852b87ff9 Merge pull request #14054 from pass-by-value/raet_test_full_returns_test 
Make sure test_full_returns passes for RAET
 2014-07-09 11:18:21 -06:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Thomas S Hatch
946d54ebe4 Merge pull request #14037 from rallytime/schedule_tests 
Fix KeyError in schedule.delete and more schedule unit tests
 2014-07-08 20:09:37 -06:00
Thomas S Hatch
37a14bf37c Merge pull request #14039 from terminalmage/fix-gitfs-tests 
Fix gitfs tests
 2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests 
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
 2014-07-08 18:56:12 -06:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
rallytime
7942350a65 Fix where=None bug 2014-07-08 16:58:19 -06:00
rallytime
0a7b58652b Fix potential KeyError in schedule.delete and more unit tests 2014-07-08 15:54:30 -06:00
Thomas S Hatch
b7a6200708 Merge pull request #14027 from pass-by-value/ext_pillar_12647 
Make sure multiple git pillar sources work
 2014-07-08 13:41:38 -06:00
Thomas S Hatch
ba90c0b22e Merge pull request #14030 from rallytime/schedule_tests 
More scheduler unit tests and fixed keyerror possibility
 2014-07-08 12:27:23 -06:00
Thomas S Hatch
f0724b3b41 Use salt.utils.process.clean_proc instead of the one in master.py 
We need to clean up the master.py clean_proc so we only use one
 2014-07-08 12:18:24 -06:00
rallytime
a3c1d0e320 A few more tests for enabling and disabling jobs 2014-07-08 12:00:08 -06:00
rallytime
5ad8bb8f01 Update test docstrings 2014-07-08 11:38:16 -06:00
rallytime
cf11ca22d0 More scheduler unit tests and fixed keyerror possibility 2014-07-08 11:27:32 -06:00
Thomas S Hatch
cec3b71840 Merge pull request #14026 from cachedout/gpg_bin_check 
Check for gpg binary
 2014-07-08 11:01:23 -06:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
Mike Place
7b9c313773 Check for gpg binary 2014-07-08 10:16:05 -06:00
Thomas S Hatch
a3f9e89072 Merge pull request #14012 from rallytime/output_grains_tests 
Test for unicode characters in grains outputter
 2014-07-07 16:48:23 -06:00
Thomas S Hatch
09366515dc Merge pull request #14016 from rallytime/fix_bad_copypaste 
Fix typo in email from bad copy-paste
 2014-07-07 16:16:47 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
Colton Myers
330a2d3bb8 Merge pull request #14010 from cachedout/gpg_bin_check 
gnupg test fix
 2014-07-07 16:00:29 -06:00
Thomas S Hatch
c1d151067d verify the raet cacedir in tests 2014-07-07 15:56:16 -06:00
rallytime
b4f98fc505 fix email address 2014-07-07 15:44:36 -06:00
rallytime
e1b6a2a9f1 Remove unnecessary line 2014-07-07 15:37:07 -06:00
rallytime
9aceee587c Test for unicode characters in grains outputter 2014-07-07 15:35:10 -06:00
Mike Place
44a06ef7f0 Fix gpg test 2014-07-07 15:26:27 -06:00
Pedro Algarvio
ed7d14e237 White-space lint fix 2014-07-05 00:45:53 +01:00
Pedro Algarvio
1ffb0e8a51 White-space related fixes 2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14 Move imports 2014-07-04 00:56:48 +01:00
Mike Place
89bf75fe84 Merge pull request #13974 from rallytime/schedule_unit_tests 
Some unit tests for salt.utils.schedule
 2014-07-03 15:55:09 -06:00
rallytime
a7eadd74ff remove unnecessary comment 2014-07-03 15:49:59 -06:00
rallytime
656db75ac0 Started some schedule unit tests 2014-07-03 15:48:46 -06:00
Thomas S Hatch
07f55489b8 Merge pull request #13942 from cachedout/call_test_fix 
Fix broken test.
 2014-07-02 17:10:16 -06:00
Mike Place
51e3089a7c Fix broken test. 2014-07-02 14:40:08 -06:00
Nitin Madhok
900021a820 Fixing lint in tests/integration/shell/auth.py 2014-07-02 16:11:49 -04:00
Thomas S Hatch
a985508513 Merge pull request #13902 from cachedout/auth_test_fixing 
Fix failing auth test
 2014-07-02 10:17:16 -06:00
Mike Place
a8c422da07 Just run useradd/userdel once 2014-07-01 17:04:16 -06:00
Thomas S Hatch
0dee0d82e9 Merge pull request #13901 from cachedout/fix_arg_test 
Fix broken arg test
 2014-07-01 16:57:46 -06:00
Mike Place
6e31fb42a0 Decorate teardown just to be sure 2014-07-01 16:40:32 -06:00
Mike Place
be07ccbd7c Fix failing auth test 2014-07-01 16:38:30 -06:00
Mike Place
504378668c Fix broken arg test 2014-07-01 16:07:59 -06:00
Mike Place
c3d0b5cba5 Dummy file to fix failing tests. 2014-07-01 15:58:01 -06:00
Mike Place
f9478a70f7 Fix all RAET publish tests 2014-07-01 15:13:52 -06:00
Thomas S Hatch
1b4736d5df lint 2014-06-30 18:01:38 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit 
File perms no exit
 2014-06-30 17:43:54 -06:00
Pedro Algarvio
db58cbd8ca Ignore import 2014-06-30 01:03:36 +01:00
Colton Myers
0c4b66aa8a Merge pull request #13806 from whiteinge/rest_cherrypy-401-fix 
Raise a 401 reponse instead of redirecting to the login page
 2014-06-27 15:14:17 -06:00
Seth House
f18a636628 Raise a 401 reponse instead of redirecting to the login page 
Also fixed bad tests that should have caught this.

Fixes saltstack/salt-api#155.
 2014-06-27 14:03:34 -06:00
Thomas S Hatch
a56bed4d03 Don't force import of salt.master in integration tests 2014-06-27 13:13:41 -06:00
Thomas S Hatch
13099a458e Fix test where the arg passing should run through 
parse input first
 2014-06-26 21:48:59 -06:00
Thomas S Hatch
4551c46abb Give minions a unique pki dir in raet minion swarm 2014-06-26 12:19:31 -06:00
Thomas S Hatch
ecc9b33859 iraet swarm needs ports 2014-06-26 11:35:12 -06:00
Aditya Kulkarni
a23f320080 Merge pull request #13764 from pass-by-value/more_test_fixes 
Update expected message
 2014-06-26 13:30:20 -04:00
Thomas S Hatch
e20da9feca Add sock_dir to raet swarming 2014-06-26 11:04:11 -06:00
Aditya Kulkarni
b991977e69 Update expected message 2014-06-26 12:58:49 -04:00
Aditya Kulkarni
54110a9658 Fix paths 2014-06-26 10:18:58 -04:00
Nitin Madhok
6773a34c1f Fixing pylint violations 2014-06-25 19:27:16 -04:00
Aditya Kulkarni
3e423b4818 Merge pull request #13730 from pass-by-value/test_master_tops 
Add regression test for master_tops
 2014-06-25 17:19:54 -04:00
Aditya Kulkarni
55c92b4eeb Move master top file before test 2014-06-25 16:50:17 -04:00
Thomas S Hatch
5f959591c6 Merge pull request #13713 from terminalmage/issue13672 
Allow traversing dicts nested with lists when matching
 2014-06-25 14:40:26 -06:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
Erik Johnson
d726c2f48a Add additonal unit tests for pull request #13713 2014-06-25 11:52:02 -05:00
Matthew Williams
45fadcf885 fix bugs in highstate whitelist, add tests 2014-06-24 17:38:53 -04:00
rallytime
c001f717a4 Fix digital ocean provider integration tests 2014-06-24 14:33:15 -06:00
Aditya Kulkarni
8ee2e01092 Change from auto to pam 2014-06-24 14:17:54 -04:00
Aditya Kulkarni
79c55a4784 Make sure tests pass on the right setup 2014-06-24 14:13:30 -04:00
Aditya Kulkarni
2836600b87 Add tests for pam auth 2014-06-24 14:13:30 -04:00
Aditya Kulkarni
909213ab1f Add CLI options for username and password 2014-06-24 14:13:30 -04:00
rallytime
67e65b237d More cloud config unit tests 2014-06-24 10:59:46 -06:00
Joseph Hall
93f559def2 Merge pull request #13656 from rallytime/cloud_config_tests 
More cloud profile config tests
 2014-06-23 15:22:56 -06:00
rallytime
f821ccaa88 More cloud profile config tests 2014-06-23 15:19:11 -06:00
Joseph Hall
fa2c1f5eef Merge pull request #13653 from rallytime/cloud_config_tests 
One more cloud config unit test
 2014-06-23 12:30:28 -06:00
rallytime
d9f53a37f9 One more cloud config unit test 2014-06-23 12:17:26 -06:00
Thomas S Hatch
d8efa82b15 initial commit for minion swarm to work with raet 
This skips the single keygen that zeromq transport uses because
1. Key gen is not exposed to salt-key yet for raet
2. raet keys are super fast, so I don't think this will be an issue,
but testing on a grander scale will tell us for sure
 2014-06-22 22:40:40 -06:00
Pedro Algarvio
de4892b7ee Reorder imports and don't even run setUp is expensive tests are not enabled 2014-06-23 01:00:42 +01:00
Pedro Algarvio
a283d52df1 Reorder imports and don't even run setUp is expensive tests are not enabled 2014-06-23 01:00:04 +01:00
Pedro Algarvio
99a8e05aa9 Reorder imports and don't even run setUp is expensive tests are not enabled 2014-06-23 00:59:27 +01:00
Pedro Algarvio
992cdc07b1 Reorder imports and don't even run setUp is expensive tests are not enabled 2014-06-23 00:58:39 +01:00
Joseph Hall
3d6eeb903d Merge pull request #13632 from rallytime/cloud_config_tests 
Make cloud configuration unit tests more organized
 2014-06-21 13:24:01 -06:00
Pedro Algarvio
55cd462fa7 No need to iterate through keys 2014-06-21 15:34:33 +01:00
Pedro Algarvio
c952a4d61b Remove unused import. White-space lint fix 2014-06-21 15:33:11 +01:00
Pedro Algarvio
bffb2b1524 Merge pull request #13619 from jacksontj/develop 
Add some basic tests for some of the globals noted in #12292
 2014-06-21 09:08:40 +01:00
Thomas Jackson
9d36f9f301 Add some basic tests for some of the globals noted in #12292 
This is by no means complete (a lot of modules get __low__ or __env__ from their callers), but this will help catch some of the problems where we change the loader and the magic stops.

IMO we kinda need to overhaul the loader, and break out the module load, __virt__ running, packing of globals, and caching into seperate pieces
 2014-06-20 19:00:10 -07:00
rallytime
d9c9297954 Make cloud configuration unit tests more organized 2014-06-20 15:47:00 -06:00
rallytime
1e83b2012b Unit tests for is_provider_configured function in salt.config.py 2014-06-20 15:29:18 -06:00
Pedro Algarvio
df80f4facb Under Py2.6 we need unittest2 to be able to access assertRaisesRegexp 2014-06-20 14:26:24 +01:00
Thomas S Hatch
d52ad3a99a Lint 2014-06-19 22:21:16 -06:00
Pedro Algarvio
d4c07d6776 Merge pull request #13574 from whiteinge/misc-salt-api-fixes 
Misc salt api fixes
 2014-06-20 01:28:41 +01:00
Pedro Algarvio
15071b460a Merge pull request #13579 from rallytime/cloud_config_unittests 
Unit tests for cloud_config function in salt.config.py
 2014-06-20 00:50:08 +01:00
Seth House
66e2b54f36 Added encoding comment to empty init files 2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Thomas S Hatch
a46e6f4875 Merge pull request #13383 from s0undt3ch/issues/10404-vt-ptys-not-released 
[DO NOT MERGE] Fix #10404 vt ptys not released
 2014-06-19 14:16:52 -06:00
Pedro Algarvio
f518e1f186 Merge pull request #13564 from rallytime/migrate_cloud_config_tests 
Migrate cloud config tests
 2014-06-19 19:10:17 +01:00
rallytime
8f74282a34 Removed cloud_config_test.py file 2014-06-19 09:24:47 -06:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Pedro Algarvio
c0ffb0814a Make the NetAPI tests skip if CherryPy is not installed 2014-06-19 12:59:23 +01:00
Pedro Algarvio
3c73c9c4c6 Provide a switch to run the NetAPI tests. 2014-06-19 12:58:52 +01:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
b488afe042 Renamed APIClient to NetapiClient to avoid ambiguity 
Renaming pre-merge to avoid post-merge ambiguity with the unfortunately
named salt.client.api.APIClient(). Sometime in the future netapi modules
are likely to be rewritten to use salt.client.api.APIClient() instead.
 2014-06-18 19:40:51 -06:00
Pedro Algarvio
305691bb8c Merge pull request #13551 from rallytime/cloud_provider_unit_tests 
Cloud provider unit tests
 2014-06-19 01:21:17 +01:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
Seth House
d526c9ec2b Mock fire_event() in test to check auth setting 2014-06-18 16:52:14 -06:00
Seth House
bbd8e1a856 Add mock for replacing get_event() in tests where needed 2014-06-18 16:51:51 -06:00
rallytime
914c9ed1fb First rudimentary cloud provider config tests 2014-06-17 15:12:23 -06:00
Thomas S Hatch
82c8440f09 Merge pull request #13511 from cachedout/more_gitfs_fix 
Create gitfs cache dir if does not exist
 2014-06-17 13:58:45 -06:00
Mike Place
c4f5298d62 Create gitfs cache dir if does not exist 
Should fix test suite
 2014-06-17 12:04:53 -06:00
Pedro Algarvio
69e9f14f39 Cleanup header 2014-06-17 09:57:23 +01:00
Pedro Algarvio
becc4dc08a Update Jenkins script to latest develop 2014-06-17 09:56:25 +01:00
Pedro Algarvio
700dc02491 jenkins.py should remain equal to the develop branch 2014-06-17 09:56:05 +01:00
Pedro Algarvio
2809d68e11 Allow passing which transport to use when testing 2014-06-17 09:56:05 +01:00
Pedro Algarvio
cd37a4b2be Fix header 2014-06-17 09:56:05 +01:00
Pedro Algarvio
fd0b301a34 Remove extra white-sapce 2014-06-17 09:56:05 +01:00
Pedro Algarvio
107ca41d9b LXC requires a deployment host 2014-06-17 09:56:04 +01:00
Pedro Algarvio
1d465f4af7 Double quote YAML 2014-06-17 09:56:04 +01:00
Pedro Algarvio
3226a08ea1 peer needs arg as a YAML string 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec1c278168 Reset cloud to False if LXC is chosen 2014-06-17 09:56:04 +01:00
Pedro Algarvio
9ecc03b018 Drop SSH runtests execution but keep SCP file copying. 2014-06-17 09:56:04 +01:00
Pedro Algarvio
97ae4aa19c Error on SSH use 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec486bfd1b Force fake tty's and explicit exits! 2014-06-17 09:56:03 +01:00
Pedro Algarvio
b3a4553bcb Fix unit tests XML files download 2014-06-17 09:56:03 +01:00
Pedro Algarvio
f1b5ed761a Minor reordering 2014-06-17 09:56:03 +01:00
Pedro Algarvio
10643602c4 Allow matching tagged versions 2014-06-17 09:56:03 +01:00
Pedro Algarvio
3edb0cbfde Don't forget the python executable 2014-06-17 09:56:03 +01:00
Pedro Algarvio
d4890d314a Allow download and clean up commands to be executed without a deployment 2014-06-17 09:56:03 +01:00
Pedro Algarvio
8cbefb3391 Download remote logs 2014-06-17 09:56:03 +01:00
Pedro Algarvio
6e1e4ce902 Remove double command 2014-06-17 09:56:03 +01:00
Pedro Algarvio
8d1b081f74 Force a TTY when running the tests suite using SSH. 2014-06-17 09:56:02 +01:00
Pedro Algarvio
46bf37e009 First 7 chars not last 7 chars 2014-06-17 09:56:02 +01:00
Pedro Algarvio
58c1b5ce90 Use HEREDOCS when using SSH to send commands 2014-06-17 09:56:02 +01:00
Pedro Algarvio
517b0a096e We can only concatenate lists, not list + tuple 2014-06-17 09:56:02 +01:00