Thomas S Hatch
558e2283d1
Merge pull request #14474 from robmessick/issue14469
...
add optional pre_releases argument to gem.install
2014-07-25 10:34:38 -06:00
Thomas S Hatch
8e0d8a7b9f
Merge branch '2014.7' into develop
2014-07-25 10:30:07 -06:00
Thomas S Hatch
0577b4070b
lint fix
2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401
Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr
...
Skip test on Darwin after making an effort
2014-07-25 10:20:10 -06:00
Rob Messick
74cf92331b
add optional pre_releases argument to gem.install
2014-07-24 17:26:27 -07:00
Seth House
2bc1ed8afb
Switch NetapiClient to use client_config instead of master_config
...
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
2014-07-24 16:08:31 -06:00
Seth House
33043ef919
Added NetapiClient integration tests
2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c
Add tests for the cmd_sync and cmd_async RunnerClient methods
2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb
Move eauth_creds to class-level for reuse
2014-07-24 16:08:30 -06:00
Seth House
b077b2436e
Add 'auto' eauth backend for tests
2014-07-24 16:08:30 -06:00
Seth House
fed58155bc
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-07-24 16:04:39 -06:00
C. R. Oldham
9dc3f696ca
Fix two RHEL7 tests
2014-07-24 14:11:03 -07:00
Pedro Algarvio
ea01af39b4
Skip test on Darwin after making an effort
2014-07-24 13:12:46 +01:00
Colin Johnson
c8e8bf1577
LYFT-14491 - unit tests for rule modification
2014-07-23 22:59:38 +00:00
Colin Johnson
2ad52a5c06
LYFT-14491 - states unit test for rule modification
2014-07-23 22:59:28 +00:00
rallytime
9b9a60efea
Skip vt_test in os x - still needs some work to run
2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476
Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr
...
Allow the VT tests to run on OSX
2014-07-23 14:38:58 -06:00
Pedro Algarvio
6c7e39dfcd
Factor out into a function the current number of PTY's detection code
2014-07-23 19:43:18 +01:00
rallytime
51c7b95e6f
Give rhel5 a chance to pass the cache tests
2014-07-22 15:38:54 -06:00
rallytime
a3da60def4
Remove unnecessary print statement
2014-07-22 12:16:39 -06:00
Pedro Algarvio
fa2149e1da
Allow the VT tests to run on OSX
2014-07-22 15:20:03 +01:00
rallytime
7bb5ef3773
Skip lxc tests if no lxc and skip failing vt_test if running osx
2014-07-21 17:11:20 -06:00
rallytime
73b185cb72
Allow OSX to run tests with change to TMPDIR
2014-07-21 14:26:59 -06:00
rallytime
c70c8ee5aa
Remove cloud_config tests for deprecated arguments
2014-07-17 16:41:11 -06:00
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
Thomas S Hatch
5a8a5c3485
Merge pull request #14300 from pass-by-value/more_matcher_test_fixes
...
Ensure tests pass on raet and zmq
2014-07-17 14:19:39 -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
rallytime
81e06fa252
Removed deprecated functions in salt/modules/ps.py
2014-07-16 12:49:45 -06:00
Colton Myers
11bfbd7a85
Merge pull request #14272 from rallytime/deprecate_check_dns
...
Deprecate check_dns
2014-07-16 11:44:32 -06:00
rallytime
dfb8894e6a
Remove unused imports
2014-07-16 06:41:28 -06:00
rallytime
6733f45924
Removed deprecated references to check_dns
2014-07-16 06:26:08 -06:00
rallytime
1c3737a883
Remove remaining references and tests to no_site_packages
2014-07-16 06:00:08 -06:00
rallytime
4d329296b0
Remove unused import
2014-07-15 18:15:58 -06:00
rallytime
534f3df900
Remove test for no_site_packages deprecation
2014-07-15 17:28:40 -06:00
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
