valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,882 Commits 24 Branches 182 Tags 341 MiB
3636480d0a
Commit Graph

2730 Commits

Author SHA1 Message Date
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