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
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
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
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
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
698784d1e7
White-space lint fix
2014-07-15 01:43:52 +01: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
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
Thomas S Hatch
7e54d0fa20
Revert "lxc refactor"
2014-07-12 11:38:03 -06:00
Thomas S Hatch
1e5a545c8c
Merge pull request #14137 from mgwilliams/lxc
...
lxc refactor
2014-07-11 16:00:06 -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
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
e5fe94227f
Merge pull request #14097 from mgwilliams/lxc
...
add lxc integration tests
2014-07-10 13:31:17 -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
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
1acf3ac3a9
Fix batch test
2014-07-09 22:00:41 -06: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
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
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
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
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
Aditya Kulkarni
a7b52855d3
Make sure multiple git pillar sources work
2014-07-08 10:58:31 -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
Thomas S Hatch
c1d151067d
verify the raet cacedir in tests
2014-07-07 15:56:16 -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
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
