valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,244 Commits 24 Branches 182 Tags 341 MiB
77b3817d7a
Commit Graph

3138 Commits

Author SHA1 Message Date
Thomas S Hatch
608d053844 Merge pull request #17121 from plastikos/improvement-yaml_quote 
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters...
 2014-11-04 14:02:05 -07:00
Thomas S Hatch
ff593e30b2 remove duplicate code 2014-11-04 10:05:24 -07:00
Roman Inflianskas
202d3c343a modules.linux_acl: add recursive option for all functions 2014-11-04 19:54:41 +03:00
Thomas S Hatch
8e8b4c6b5c lint 2014-11-04 09:48:58 -07:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +03:00
Roman Inflianskas
403a8b4cc9 modules.linux_acl: cleanup comments 2014-11-04 14:45:23 +03:00
Roman Inflianskas
b6cbb70e38 modules.linux_acl: add unit tests 2014-11-04 14:45:17 +03:00
Roman Inflianskas
8f409a4180 modules.linux_acl: add unit tests 2014-11-04 14:45:06 +03:00
Roman Inflianskas
16b4e2619f modules.linux_acl: raise exception on no files given; add unit tests 2014-11-04 14:44:44 +03:00
Thayne Harbaugh
dc4892442a Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters. 
When templating state files the variable contents may contain
characters that YAML will interpret specially.  Rather than try to
escape the special characters so that they are safe use a filter that
protects special characters in YAML values.
 2014-11-03 16:14:54 -07:00
Roman Inflianskas
f5903dfe6d modules.parted: tests: fixed probe deprecation testing #2 2014-11-03 13:12:46 +03:00
Roman Inflianskas
d04abdf91a modules.parted: tests: fixed probe deprecation testing 2014-11-03 12:30:13 +03:00
Roman Inflianskas
70e4062cf9 Actually testing parted 
called_once_with didn't work, changed to assert_called_once_with
 2014-11-03 11:52:01 +03:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas S Hatch
15a51935fa Merge pull request #17073 from jfindlay/jmoney/linux_sysctl_test 
Jmoney/linux_sysctl_test
 2014-10-31 15:25:35 -06:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Justin Findlay
f09b8e3873 remove redundant mock_open() in darwin_sysctl_test.py 2014-10-31 10:42:57 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -06:00
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7 
Fix for #17051
 2014-10-31 10:14:16 -06: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
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by 
Improve filter_by() base argument:
 2014-10-30 10:02:32 -06:00
Pedro Algarvio
17564057c9 Actually kill the tests sshd process. Provide a custom know_hosts file to use. 2014-10-30 06:45:52 +00:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Thomas Jackson
6612aa808e Revert spelling fix, since its a variable name :) 2014-10-29 13:56:44 -07:00
Pedro Algarvio
136803bb9d Merge pull request #16941 from cachedout/remove_deprecations 
Remove deprecations
 2014-10-28 18:49:12 +00:00
Mike Place
c1c9245e89 Fixup test failures 2014-10-28 11:29:59 -06:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
Seth House
0d6e33a419 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-28 08:47:18 -05:00
Mike Place
39d6d8e75f remove splitted test 2014-10-27 18:23:20 -06:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
Mike Place
8dc8ee51be Merge pull request #16942 from rallytime/module_state_tests 
Added unit tests for module state
 2014-10-27 18:13:11 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests 
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
 2014-10-24 16:14:02 -06:00
rallytime
19d70dfac5 Added another test to module.run state unit tests 2014-10-24 15:28:03 -06:00
Thayne Harbaugh
7bd7e4c2b7 Appease the pylint gods; back-out unrelated changes. 2014-10-24 11:32:12 -06:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06:00
rallytime
f6490e9572 Add initial unit tests for module.run state function 2014-10-24 08:56:40 -06:00
Thomas S Hatch
08db71c0b9 Merge pull request #16849 from makinacorpus/f4 
Support for vt in pip & venv modules
 2014-10-23 15:13:48 -06:00
Thomas S Hatch
743586e53b Merge pull request #16837 from felskrone/cachecli_only_with_concache 
if con_cache is inactive, dont create con_cache-client
 2014-10-23 14:06:40 -06:00
Mathieu Le Marec - Pasquet
2b4d7e3080 Support for vt in pip & venv modules 2014-10-23 20:18:44 +02:00
Thomas S Hatch
b06b21c8a9 Merge pull request #16785 from bahadir/add-batch-timeout 
Don't use hardcoded timeout value in batch mode.
 2014-10-23 11:59:29 -06:00
vs
b814c09cab provide con_cache in the opts 2014-10-23 19:08:08 +02:00
rallytime
df827ab13c Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/minions.py
 2014-10-21 16:07:33 -06:00
Nicole Thomas
ff1646e451 Merge pull request #16769 from rallytime/jid_str_test 
Test long jid passed on CLI
 2014-10-21 15:50:29 -06:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Bahadır Kandemir
713e168fc2 Add option to mock test. 2014-10-21 18:08:21 +03:00
rallytime
ed37dde094 Pylint fix 2014-10-20 21:21:01 -06:00