Commit Graph

66377 Commits

Author SHA1 Message Date
Daniel Hobley
4d75b817af Lint fixes 2016-03-14 09:32:45 +01:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
2016-03-11 11:52:15 -06:00
Daniel Hobley
4b31241378 Added shell escaping for security reasons 2016-03-11 11:09:17 -06:00
Nicole Thomas
877aed1ae5 Merge pull request #31569 from twangboy/reg_pkg
Use win_reg for registry calls
2016-03-11 09:46:11 -07:00
Erik Johnson
21600a5478 Merge pull request #31806 from rallytime/github-mod-updates
Update github module to be more user-friendly
2016-03-11 10:15:32 -06:00
rallytime
de0cc97a51 Add code-block:: bash declarations 2016-03-10 21:14:19 -07:00
rallytime
cf0b2df8e9 Make configuration docs easier to read 2016-03-10 20:59:40 -07:00
rallytime
02e67c44ee Update github module to be more user-friendly
- Add/update configuration and function docs
- Add error messages when required settings are missing
- Make helper functions a little more DRY, with error messages
2016-03-10 16:01:52 -07:00
Nicole Thomas
b628b5574e Merge pull request #31801 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-10 14:24:53 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test
Change pkg name to less for suse pkg.info_installed test
2016-03-10 12:08:16 -07:00
Nicole Thomas
98b868c573 Merge pull request #31690 from jfindlay/mac_tests
Mac tests
2016-03-10 12:03:00 -07:00
Nicole Thomas
1386b72bbf Merge pull request #31793 from xopher-mc/fix_sles_state_service_module
fixing init system detection on sles 11, refs #31617
2016-03-10 11:42:27 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Nicole Thomas
2f28c166dd Merge pull request #31786 from isbm/isbm-zypper-list-products-sles11
Bugfix: zypper doesn't detect base product on SLE11 series
2016-03-10 11:12:46 -07:00
Justin Findlay
e46bac2d98 transport.tcp unit tests: disable hanging tests 2016-03-10 10:57:21 -07:00
Justin Findlay
992a8af726 renderers.gpg unit tests: mock gpg command 2016-03-10 10:57:21 -07:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66 states.cmd int tests: echo is more portable than true 2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6 states.user int tests: check MacOS primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7 states.user int tests: disable GECOS for MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f states.file int tests: find root's primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
08493d85fd states.file unit tests: mark tests destructive for touching file 2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e states.file unit tests: use existing file for unmocked tests 2016-03-10 10:57:20 -07:00
Justin Findlay
fe2fd3f993 modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
eb2964d517 modules.mount unit tests: mock /etc/fstab 2016-03-10 10:57:20 -07:00
Justin Findlay
328d058f22 modules.linux_sysctl unit tests: mock ctl presence 2016-03-10 10:57:20 -07:00
Justin Findlay
7407392d42 modules.gpg: remove unused and duplicate imports 2016-03-10 10:57:20 -07:00
Justin Findlay
cfa962fd36 modules.gpg: refactor trust_key cmd to bypass shell 2016-03-10 10:57:20 -07:00
Justin Findlay
3c9f61231c modules.gpg: rename _gpg function 2016-03-10 10:57:20 -07:00
Justin Findlay
c2f4da1781 modules.gpg: only return (False, reason) in __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
590c0ad986 modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
Justin Findlay
424a8b11bd modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
2dddc63daf modules.mac_user: add and remove user home dir 2016-03-10 10:57:20 -07:00
Justin Findlay
2fe1160143 modules.mac_user.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
5905518ee5 modules.mac_user int tests: fix comment typo 2016-03-10 10:57:19 -07:00
Justin Findlay
fea37b303e modules.mac_user int tests: move common decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
86b2522a7f modules.mac_user.primary_group: return user's primary group 2016-03-10 10:57:19 -07:00
Justin Findlay
e53ae6c44e modules.useradd.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
528a9d1996 modules.useradd.primary_group: return user's primary group 2016-03-10 10:57:19 -07:00
Justin Findlay
ba19f395d1 modules.useradd int tests: disable testcase on nonlinux 2016-03-10 10:57:19 -07:00
Justin Findlay
ddea2361de modules.useradd int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
f69ab83623 modules.disk int tests: mtab not used on darwin 2016-03-10 10:57:19 -07:00
Justin Findlay
d818810200 modules.disk int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
bdb210dc13 modules.disk int tests: assert darwin disk usage 2016-03-10 10:57:19 -07:00
Justin Findlay
73ad02e917 modules.disk: run both integration test cases manually 2016-03-10 10:57:19 -07:00
Justin Findlay
0098c1c554 modules.blockdev test: mock utils.which 2016-03-10 10:57:19 -07:00
Justin Findlay
2f1c0cf809 shell tests: strip whitespace from shell return 2016-03-10 10:57:19 -07:00
Justin Findlay
c94dfb870f shell tests: comment on shell return data 2016-03-10 10:57:19 -07:00