valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,334 Commits 24 Branches 182 Tags 341 MiB
28b40de8da
Commit Graph

92 Commits

Author SHA1 Message Date
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
Erik Johnson
e2342aadb7 tests/integration/modules/state.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in 
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
 2015-06-17 21:57:37 -07:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
Colton Myers
8c1fa5358e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/debian_ip.py
	salt/modules/file.py
	salt/states/ssh_auth.py
	salt/utils/cloud.py
 2015-03-09 11:50:21 -06:00
Justin Findlay
a6b86ef627 indent quoted code in cmdmod tests 2015-03-02 16:08:49 -07:00
Justin Findlay
3397dc5540 fix state request tests 2015-02-27 16:15:26 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
rallytime
c3f786c966 listen and listen_in requisite tests 2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5 onfail and onfail_in requisite tests 2015-02-19 14:35:26 -07:00
rallytime
208b4906d8 Onchanges and onchanges_in requisite tests! 2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66 Add one onchanges requisite test 2015-02-18 17:16:07 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Pedro Algarvio
a4e48e8873 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much 
Add checks for "changes" since we want to test cases where there aren't changes to be made
 2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Pedro Algarvio
5f2cc54160 Assert proper return types from state calls. 
Just to be sure.
 2014-06-11 01:12:13 +01:00
Thomas S Hatch
988101cf8d update tests to handle new return data from states 2014-05-14 16:09:27 -06:00
Erik Johnson
74180b1da0 More test fixes 2014-04-21 20:36:23 -05:00
Erik Johnson
c41526c913 Fix tests to match new error messages 2014-04-21 20:07:06 -05:00
Pedro Algarvio
bb70a0e381 Switch quotes to make test pass 2014-03-31 22:30:16 +01:00
Pedro Algarvio
b1ddb350b6 Some more white-space lint fixes 2014-01-11 13:48:12 -07:00
Pedro Algarvio
c8038d87b1 Use KNOWN_BINARY_NAMES from salt.modules.virtualenv 2014-01-11 12:19:29 -07:00
Pedro Algarvio
2cab3227fd The virtualenv binary can have multiple CLI names. 2014-01-02 20:27:18 +00:00
Thomas S Hatch
26a3eb1ec8 remove test for not yet covered case 2013-12-19 14:27:40 -07:00
Thomas S Hatch
49f4ae324f Changed underlying error message to be more concise 2013-12-13 15:27:44 -07:00
Erik Johnson
685d1d36de Fix requisite tests 
Now that state.func_name is invalid in requisites, remove them from this
test.
 2013-12-06 15:16:57 -06:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Pedro Algarvio
f2e3a4aebe Fix PyLint C0322 and C0324 - Spaces around opertor and commas 2013-11-27 12:48:53 +00:00
Pedro Algarvio
0ae1a15c61 PEP8 E302 and E303 blank lines fixes. 2013-11-27 12:11:45 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Thomas S Hatch
5637339b2c Merge pull request #8823 from regilero/requisites-fix 
Fix #8773: allow syntax error state.foo in requisites with a warning.
 2013-11-26 08:07:40 -08:00
regilero
4497751420 Fix #8773: allow syntax error state.foo in requisites with a warning. 2013-11-26 11:57:09 +01:00
regilero
9094d36b44 Comment tests for closed issue #8802 2013-11-26 10:54:32 +01:00
regilero
ab88a276dc remove test for issue #8976 closed as expected behavior 2013-11-26 10:51:47 +01:00
regilero
9b20a408a4 commented tests for issue 8802 use recursion undetected 2013-11-25 15:35:22 +01:00
regilero
38bd6709f0 require vs require_in in not-list yamlsyntax: differences, still on #8235 2013-11-25 12:58:59 +01:00
regilero
58bfbff843 prereq tests for issue #8235 (yaml without lists) and error message difference in no-list mode 2013-11-25 12:46:02 +01:00
regilero
8024df8404 Add test for #8796: use does not inherit require. False test actually 2013-11-25 11:06:37 +01:00
regilero
8177f2b609 Add another working prereq simple test 2013-11-24 18:30:15 +01:00
regilero
ddb99a570d require and prereq mixed tests, mostly failing, see #8785 2013-11-24 18:28:22 +01:00
regilero
ab4ee0ba1f full sls require test, and yet to do check for require_in or prereq #8233 2013-11-23 18:56:07 +01:00
regilero
7b01991c0a require recursion and still not done prereq recursion 2013-11-23 18:20:15 +01:00