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
Justin Findlay
34ba477b09
tests.runtests: configurable filehandle limits
2016-03-10 10:57:18 -07:00
Justin Findlay
3a77e7d383
tests.runtests: increase file limit for MacOS unit tests
2016-03-10 10:57:18 -07:00
Justin Findlay
4028d80eee
tests...runtests_helpers: use system tmpdir
2016-03-10 10:57:18 -07:00
Justin Findlay
6b99798b1e
tests.integration: use system tmpdir on darwin
2016-03-10 10:57:18 -07:00
Justin Findlay
bf894c378b
utils.abs_readlink: return abs path, dereference symlinks
2016-03-10 10:57:18 -07:00
Nicole Thomas
92d9b1fb6a
Merge pull request #31785 from sjorge/2016-3-smartos-state
...
fix salt.states.smartos.vm_present update needed check
2016-03-10 10:51:11 -07:00
Nicole Thomas
a166956cba
Merge pull request #31781 from Unity-Technologies/hotfix/keychain-salt-filesystem
...
Fixed installing keychain certificates from salt fileserver
2016-03-10 10:49:38 -07:00
Jorge Schrauwen
4c444d9c06
fixed issues were a value is parsed as string or number that fail the needs update check
2016-03-10 11:06:34 +00:00
Daniel Hobley
14ddae0aa8
Fixed installing keychain certificates from salt fileserver
2016-03-09 18:16:47 -06:00
Nicole Thomas
5424159604
Merge pull request #31707 from sjorge/2016.3-top
...
Fix incorrect default types for master_tops and file_ignore_regex
2016-03-09 16:33:26 -07:00
Nicole Thomas
2feee850ca
Merge pull request #31725 from techhat/issue31681
...
Ensure that vm_details is a dict
2016-03-09 15:56:09 -07:00
Nicole Thomas
12c8e5a68e
Merge pull request #31730 from thatch45/fix_flodir
...
fix bug introduced by moving config into directory
2016-03-09 11:37:56 -07:00
Nicole Thomas
f1c8e54135
Merge pull request #31746 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-09 11:37:43 -07:00
Nicole Thomas
5b9c384562
Merge pull request #31753 from rallytime/bp-31694
...
Back-port #31694 to 2016.3
2016-03-09 10:57:26 -07:00
rallytime
46d29e7594
Fix daemons test logger --> log references
2016-03-09 10:51:07 -07:00
Brian Jackson
47a865170e
Add private_ips to list_nodes_full for vultrpy.py
...
Add private_ips to list_nodes_full for vultrpy.py
2016-03-08 13:24:50 -07:00
rallytime
c9aabb429e
Pylint is being weird...
2016-03-08 13:11:11 -07:00
rallytime
f9d139cc3c
Pylint Fix
2016-03-08 10:58:37 -07:00
rallytime
afdb19a307
Resolve merge conflicts in salt/cli/daemons.py
2016-03-08 10:31:21 -07:00
rallytime
838dc12b77
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/exceptions.py
- salt/pillar/foreman.py
- salt/returners/local_cache.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/cloud.py
The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
Thomas S Hatch
e5da261c71
fix bug introduced by moving config into directory
2016-03-07 15:35:50 -07:00
Mike Place
826fea6582
Merge pull request #31162 from isbm/isbm-md5-to-sha1
...
Remove MD5 digest from everywhere and default to SHA256
2016-03-07 12:11:36 -07:00
