Commit Graph

2648 Commits

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