Commit Graph

2618 Commits

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