Omer Katz
78def8c70b
Added unit tests that verify that vpc creation reports success/failure correctly.
2014-10-02 14:26:36 +03:00
rallytime
8e55094ecd
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/influx.py
2014-10-01 10:12:06 -06:00
Thomas S Hatch
37267f76b9
Merge pull request #16276 from jacksontj/2014.7
...
Ensure that timeout will happen for jobs that don't target any alive minions
2014-09-30 16:24:19 -06:00
Thomas S Hatch
1cfd7f7d66
Merge branch '2014.7' into develop
...
Conflicts:
salt/netapi/rest_tornado/saltnado.py
2014-09-30 11:40:15 -06:00
Thomas Jackson
d9fdc06742
Ensure that timeout will happen for jobs that don't target any alive minions
...
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
2014-09-30 10:11:55 -07:00
Steve Weber
a0c3723c96
removed the slash when using slspath
2014-09-30 10:51:36 -06:00
Thomas S Hatch
5d895123e0
Merge pull request #16252 from steverweber/slspath
...
removed end slash on slspath
2014-09-29 20:04:40 -06:00
Thomas Jackson
98af66bbf3
Add a regression test for #16240
2014-09-29 16:37:53 -07:00
Steve Weber
6d1c32e254
removed the slash when using slspath
2014-09-29 19:18:10 -04:00
Thomas S Hatch
7700b6c55a
Merge branch '2014.7' into develop
2014-09-29 13:46:10 -06:00
Erik Johnson
e37b337a56
Add unity manpage to buildpackage spec
...
This fixes automated package builds in jenkins
2014-09-29 13:35:50 -05:00
vs
648a860b5b
more cleanup for FSCache-removal
2014-09-27 00:59:55 +02:00
Colton Myers
3e741d7a98
Merge branch '2014.7' into develop
2014-09-25 16:37:35 -06:00
rallytime
b891ef12f0
Skip test_vt_size unit test
2014-09-25 15:38:01 -06:00
Thomas S Hatch
a90fc60a82
Merge branch '2014.7' into develop
2014-09-25 14:23:54 -06:00
Pedro Algarvio
227c62b4ee
Merge pull request #16149 from rallytime/improve_loader_test
...
Fix linode test failures and test all modules
2014-09-25 20:38:06 +01:00
Colton Myers
7f551d48b4
Merge branch '2014.7' into develop
2014-09-25 13:09:19 -06:00
rallytime
210adceeff
Actually, just fix pylint
2014-09-25 12:36:00 -06:00
rallytime
e2dce8acba
Skip ssh grains test for now. Test environment isn't set up to handle it.
2014-09-25 11:47:44 -06:00
rallytime
ac40a5b2da
Fix linode test failures and test all modules
2014-09-25 11:34:50 -06:00
Thomas S Hatch
3198a17193
Merge branch '2014.7' into develop
...
Conflicts:
salt/master.py
salt/minion.py
salt/modules/hg.py
salt/utils/process.py
2014-09-25 09:08:14 -06:00
Daniel Mizyrycki
e0c6c8c22a
salt-ssh, issue #16129 :
...
Add integration/regression test for issue affecting grains and pillar subsystem.
2014-09-24 20:58:37 -07:00
Thomas S Hatch
3ce955c774
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Thomas S Hatch
1427a56e15
Merge pull request #16077 from drawks/parted_tests
...
salt.modules.parted.list_ tweaks and tests
2014-09-24 11:51:22 -06:00
Thomas S Hatch
43272781f1
Merge pull request #15933 from felskrone/list_denied_minions
...
List denied minions
2014-09-24 09:34:19 -06:00
vs
af070a56ad
its 'Denied Keys', not 'Denied Minions'
2014-09-24 14:10:49 +02:00
Thomas S Hatch
ee9bf6c6cc
Merge pull request #16062 from rallytime/fix_ec2_tests
...
Fix the ec2 cloud provider tests
2014-09-23 17:16:10 -06:00
Colton Myers
76d5fdb41f
Revert "Change timeout for CLI returns"
2014-09-23 16:44:37 -06:00
Dave Rawks
9b761f378d
More test coverage for salt.modules.parted
...
* Full coverage for "list_" method
2014-09-23 15:44:33 -07:00
Thomas S Hatch
8c72baa660
Merge pull request #15942 from jacksontj/develop
...
Change timeout for CLI returns
2014-09-23 15:40:34 -06:00
Thomas Jackson
c77e2d36ae
Pylint fix
2014-09-23 14:37:34 -07:00
rallytime
9fc915e639
Remove 'running' check - it's not reliable
2014-09-23 15:06:08 -06:00
rallytime
1c9e062c78
Fix the ec2 cloud provider tests
2014-09-23 14:55:56 -06:00
Thomas S Hatch
3f82e3664a
Merge branch '2014.7' into develop
2014-09-23 14:41:58 -06:00
Thomas S Hatch
3ce4387f3f
Merge pull request #16001 from thatch45/ssh_fsclient
...
Ssh fsclient
2014-09-23 14:41:28 -06:00
Thomas Jackson
ff0081b53d
Remove "never timeout" feature
2014-09-23 13:35:11 -07:00
Thomas S Hatch
e2d640962a
Fix Jinja test
2014-09-23 14:02:34 -06:00
vs
b804056b65
add expected output for denied minions to test_*
2014-09-23 17:36:06 +02:00
Pedro Algarvio
f547aeae41
Merge pull request #16033 from rallytime/fix_2014.7_tests
...
Fix broken test on 2014.7
2014-09-23 00:09:10 +01:00
Dave Rawks
a3707e2bab
Simplify mock of cmd.run via setUp method
...
* reduced code duplication by handling a frequently used mock in setUp
method to testcase
2014-09-22 14:44:52 -07:00
Dave Rawks
8c0266486e
Merge branch 'develop' of https://github.com/saltstack/salt into parted_tests
2014-09-22 11:35:41 -07:00
Dave Rawks
6e6bf0e643
First pass at adding unit tests to salt.modules.parted
...
Full coverage for __virtual__, probe, and part_list
2014-09-22 11:16:37 -07:00
rallytime
9c682933d4
Fix broken test on 2014.7
2014-09-22 12:13:10 -06:00
vs
ca5e63ed24
create minions_denied in test-env, update wheel-test to expect minions_denied
2014-09-22 19:44:24 +02:00
Arnold Bechtoldt
3e483523ff
changing param back to backend in fileserver to improve useability
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7
fix integration test in fileserver runner, refs #16008
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d
extend fileserver runner with additional features
2014-09-22 11:16:26 -06:00
Thomas S Hatch
7355f53057
Add fileserver_backend to jinja tests local opts
2014-09-22 10:29:25 -06:00
Arnold Bechtoldt
043c29d518
changing param back to backend in fileserver to improve useability
2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05
fix integration test in fileserver runner, refs #16008
2014-09-21 21:19:03 +02:00
