Commit Graph

2648 Commits

Author SHA1 Message Date
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
Pedro Algarvio
54a21b14b5 All requiring the TTY flag to be optionally set 2014-06-17 09:56:02 +01:00
Pedro Algarvio
f4ba754fbe Concatenate the command string 2014-06-17 09:56:02 +01:00
Pedro Algarvio
9afc0abf8d Simplify SSH and SCP options passing 2014-06-17 09:56:01 +01:00
Pedro Algarvio
51340886f1 Typo, sync minion, and use the pub key. 2014-06-17 09:56:01 +01:00
Pedro Algarvio
f3644315f9 Some more opts references 2014-06-17 09:56:01 +01:00
Pedro Algarvio
539c4f696b Fix opts or options confusion. 2014-06-17 09:56:01 +01:00
Pedro Algarvio
2b2299642f Allow passing no color as an option 2014-06-17 09:56:01 +01:00
Pedro Algarvio
7c4fb5c389 Add support for peer execution and LXC deployments 2014-06-17 09:56:01 +01:00
Mike Place
b278fcebff Use sha1 hash for gitfs tests 2014-06-16 16:16:57 -06:00
Pedro Algarvio
9df6dd669d Allow triggering test runs using RAET for transport 2014-06-16 11:19:14 +01:00
Pedro Algarvio
9e1634d386 Patch the gitfs opts with custom opts and not master opts.
It worked but this was, as it was, it's more explicit
2014-06-15 13:25:21 +01:00
Pedro Algarvio
0a10c4d2c7 Turns out all we needed was the correct load 2014-06-15 13:24:39 +01:00
Pedro Algarvio
79d7918271 Add missing path key to the load.
Minor PEP-8, global variable `load` -> `LOAD`
2014-06-15 13:18:36 +01:00
Pedro Algarvio
edffec0159 Fix imports 2014-06-15 13:05:19 +01:00
Pedro Algarvio
7b017fe9ab Skip test for now.
/CC: @cachedout
2014-06-15 13:05:19 +01:00
Pedro Algarvio
130788864f Skip tests on missing empty_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
b2f3cecea5 Copy the extension modules into the new master root_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
bd35008d34 No need for late imports. Use AdaptedConfigurationTestCaseMixIn. 2014-06-15 13:05:19 +01:00
Pedro Algarvio
9f7ead2e33 Remove unused imports 2014-06-15 13:05:18 +01:00
Pedro Algarvio
b815bb8cb6 Call the right parent class 2014-06-15 13:05:18 +01:00
Pedro Algarvio
ccdd70750c Leave any cleanup for the end 2014-06-15 13:05:18 +01:00
Pedro Algarvio
c2ab05bc56 Tempdir under integration.SYS_TMP_DIR and use AdaptedConfigurationTestCaseMixIn 2014-06-15 13:05:18 +01:00
Pedro Algarvio
000655d7f4 Use SaltClientTestCaseMixIn instead 2014-06-15 13:05:18 +01:00
Pedro Algarvio
4cbd6c6238 Remove unused imports 2014-06-15 13:05:17 +01:00
Pedro Algarvio
70f6a90ed6 Store evaluated configs as cls attributes 2014-06-15 13:05:17 +01:00
Pedro Algarvio
007f86b5d6 Remove stray print and commented out entries 2014-06-15 13:05:17 +01:00
Pedro Algarvio
d9ce87c04c Call verify_env on transplant_configs 2014-06-15 13:05:17 +01:00
Pedro Algarvio
318409a859 Don't remove the root_dir, the tests suite takes care of that 2014-06-15 13:05:17 +01:00
Pedro Algarvio
7fbc839942 Lay down computed configuration and use that source for all of the tests 2014-06-15 13:05:17 +01:00
Pedro Algarvio
97f150db74 Revert "detect the right transport for the client in tests"
This reverts commit d33b01d635.
2014-06-15 13:05:17 +01:00
Pedro Algarvio
9fbc894f51 Revert "Cache the salt client"
This reverts commit b4786b0d8c.
2014-06-14 19:19:44 +01:00
Thomas S Hatch
60ac9b8321 Merge pull request #13433 from ahammond/psql_nopassword
psql should never prompt for a password
2014-06-14 07:24:14 -06:00
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list
Add salt.utils.traverse_dict_and_list()
2014-06-14 07:23:15 -06:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
Andrew Hammond
1c6b95b4dc psql should never prompt for a password
No matter if we have been given a password or not, it never makes sense
for psql to interactively prompt for a password. It's better to fail
immediately than to hang because psql is waiting for input that will
never happen.
2014-06-13 17:40:11 -07:00
Pedro Algarvio
b4786b0d8c Cache the salt client 2014-06-13 23:47:03 +01:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Pedro Algarvio
da7e7d71dd Merge pull request #13434 from rallytime/cloud_tests
Initial cloud provider tests for GoGrid
2014-06-13 01:08:30 +01:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
Thomas S Hatch
d33b01d635 detect the right transport for the client in tests 2014-06-12 16:53:50 -06:00
Thomas S Hatch
3799fa0841 Merge pull request #13424 from terminalmage/fix-jinja-unit-tests
Fix jinja unit tests
2014-06-12 16:18:48 -06:00
Thomas S Hatch
46cdb04ada Merge pull request #13422 from cachedout/publish_tests
Fix publish tests
2014-06-12 14:14:23 -06:00
Mike Place
616c3b5547 Fix failing test 2014-06-12 13:35:36 -06:00
Erik Johnson
0104ccc400 Fix failing jinja unit tests
These began failing due to a recent change in the error reporting for
undefined jinja variables.
2014-06-12 14:33:53 -05:00
Thomas S Hatch
525cd2a064 Use new client function 2014-06-12 12:41:00 -06:00
Thomas S Hatch
af1a21691a Skip cleaning up syndic stuff so we don't have issues with raet tests
before the syndic stuff is all ready for testing
2014-06-12 12:35:24 -06:00
Pedro Algarvio
7451e50f63 Limit the options for transport. 2014-06-11 23:09:34 +01:00
Thomas S Hatch
0b02be9af1 Initial code to do raet integration salt tests 2014-06-11 15:35:27 -06:00
Pedro Algarvio
f316a8242f Merge pull request #13392 from rallytime/rackspace_cloud_tests
Rackspace with openstack driver cloud tests
2014-06-11 19:31:05 +01:00
rallytime
87bf98a0db Code clean-up and remove shadowing 2014-06-11 11:42:00 -06:00
rallytime
28b8900b9b Added expensiveTest decorator 2014-06-11 11:35:34 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00