Benedikt Werner
4bfeb7f1d1
Fixed missing import
2017-10-19 03:17:16 +02:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow
2017-10-18 19:10:55 +02:00
Marc Koderer
c4d9684a90
Use correct mac prefix for kvm/qemu
...
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.
Issues #44056
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
2017-10-17 10:46:06 +02:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop'
...
Conflicts:
- doc/topics/tutorials/index.rst
- salt/crypt.py
- salt/modules/cmdmod.py
- salt/modules/grains.py
- salt/pillar/git_pillar.py
- salt/roster/clustershell.py
- tests/unit/states/test_augeas.py
- tests/unit/utils/test_utils.py
2017-10-16 15:26:19 -04:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor
...
This moves the remaining 30 functions from salt.utils to new locations.
2017-10-15 09:43:31 -05:00
Erik Johnson
c6b655b6e9
Move 14 more functions from salt.utils
...
These functions are:
salt.utils.test_mode -> salt.utils.args.test_mode
salt.utils.split_input -> salt.utils.args.split_input
alt.utils.pem_finger -> salt.utils.crypt.pem_finger
salt.utils.is_bin_file -> salt.utils.files.is_binary
salt.utils.list_files -> salt.utils.files.list_files
salt.utils.safe_walk -> salt.utils.files.safe_walk
salt.utils.st_mode_to_octal -> salt.utils.files.st_mode_to_octal
salt.utils.normalize_mode -> salt.utils.files.normalize_mode
salt.utils.human_size_to_bytes -> salt.utils.files.human_size_to_bytes
salt.utils.get_hash -> salt.utils.hashutils.get_hash
salt.utils.is_list -> salt.utils.data.is_list
salt.utils.is_iter -> salt.utils.data.is_iter
salt.utils.isorted -> salt.utils.data.sorted_ignorecase
salt.utils.is_true -> salt.utils.data.is_true
2017-10-13 09:29:03 -05:00
Daniel Wallace
1f8ec5d335
Merge branch 'develop' into vagrant-module
2017-10-06 11:32:31 -06:00
Nicole Thomas
d136650b31
Merge pull request #43938 from terminalmage/salt.utils.user
...
Move several functions from salt.utils to salt.utils.user
2017-10-06 09:42:42 -04:00
Erik Johnson
aa3309ef59
Move several functions from salt.utils to salt.utils.user
...
These functions are as follows:
- salt.utils.get_user
- salt.utils.get_uid
- salt.utils.get_specific_user
- salt.utils.chugid
- salt.utils.chugid_and_umask
- salt.utils.get_default_group
- salt.utils.get_group_list
- salt.utils.get_group_dict
- salt.utils.get_gid_list
- salt.utils.get_gid
2017-10-05 19:50:14 -05:00
Nicole Thomas
7785919437
Merge pull request #43829 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-05 16:09:23 -04:00
garethgreenaway
37d7f13926
Merge branch 'develop' into vagrant-module
2017-10-05 10:25:24 -07:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/modules/test_state.py
2017-10-05 12:09:40 -04:00
Nicole Thomas
a9dc04fb7f
Lint: disable the unused-import check
2017-10-05 08:51:16 -04:00
Eric Radman
0dc3c4ef1c
Skip some vsphere tests if pyvmomi library is not installed
...
Also fix up 'E127: continuation line over-indented' lint errors
2017-10-04 13:09:29 -04:00
Vernon Cole
73947e3103
lint (again!) blank lines can have no spaces
2017-10-04 09:10:47 -06:00
Vernon Cole
67a701de7c
lint PEP-8
2017-10-03 23:23:17 -06:00
Vernon Cole
83a3678cef
provide mocked unit tests
2017-10-03 17:24:05 -06:00
Vernon Cole
7d5a121265
Skip unit tests under Python3 until loader is fixed
2017-10-03 10:22:18 -06:00
rallytime
b7dae5addd
Bump with statements in one level
...
This is needed because the previous commit changed the context
management style from nested with statements to stacked with
statements.
2017-10-03 12:18:27 -04:00
Vernon Cole
c6b2e1e35b
update tests to match improved module
...
(cherry picked from commit 7fcdc51)
2017-10-02 22:10:37 -06:00
rallytime
c976df7c09
Fix mocking in test_status since the "which" util has moved
2017-09-29 13:56:01 -04:00
Alexandru Bleotu
b4a05dc7c0
Added tests for salt.modules.vsphere.remove_capacity_from_diskgroup
2017-09-29 13:39:44 -04:00
Alexandru Bleotu
ec2637db44
Added tests for salt.modules.vsphere.remove_diskgroup
2017-09-29 13:39:41 -04:00
Alexandru Bleotu
4e0755de20
Added tests for salt.modules.vsphere.remove_datastore
2017-09-29 13:39:39 -04:00
Alexandru Bleotu
51703a8a34
Added tests for salt.modules.vsphere.erase_disk_partitions
2017-09-29 13:39:36 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/master.py
- salt/utils/path.py
- tests/unit/modules/test_state.py
2017-09-29 11:48:33 -04:00
Mike Place
952b5d8e87
Merge branch 'develop' into vagrant-module
2017-09-29 12:34:41 +02:00
Vernon Cole
e9661aea07
lint: must not use bare except: even in teardown
2017-09-28 18:27:54 -06:00
vernoncole
8d27e20b63
replace salt.utils.sdb calls with __utils__
2017-09-28 16:43:47 -06:00
Mike Place
6f687fdcff
Merge pull request #43779 from twangboy/win_fix_test_state
...
Fix `unit.modules.test_state` for Windows
2017-09-28 16:27:02 +02:00
Mike Place
db0f569f7a
Merge pull request #43782 from twangboy/win_fix_test_virt
...
Fix `unit.modules.test_virt` for Windows
2017-09-28 16:25:15 +02:00
Mike Place
5e29507c21
Merge pull request #43781 from twangboy/win_fix_test_status
...
Fix `unit.modules.test_status` for Windows
2017-09-28 11:06:18 +02:00
Mike Place
05c78ae649
Merge pull request #43785 from twangboy/win_fix_test_znc
...
Fix `unit.modules.test_znc` for Windows
2017-09-28 10:56:10 +02:00
vernoncole
d59cc13ca4
try to pass unit tests on jenkins
2017-09-28 00:59:20 -06:00
garethgreenaway
1c05e37a66
Merge branch '2017.7' into win_fix_test_zypper
2017-09-27 20:15:18 -07:00
garethgreenaway
7d90721f6b
Merge branch '2017.7' into win_fix_test_znc
2017-09-27 20:14:53 -07:00
vernoncole
cfda0d54e2
test inside sandbox, fix two lines of docs
2017-09-27 17:07:29 -06:00
twangboy
aafec7ab0e
Fix unit.modules.test_zypper for Windows
...
Use `os.linesep` for newline in expected return
2017-09-27 16:59:36 -06:00
twangboy
228e74c8e3
Fix unit.modules.test_znc for Windows
...
Mock the signal object as it's missing SIGUSR1 and SIGHUP on Windows
2017-09-27 16:54:06 -06:00
twangboy
058e50e530
Fix unit.modules.test_win_service
...
Mock `cmd.run`
2017-09-27 16:37:12 -06:00
twangboy
7192332758
Fix unit.modules.test_virt for Windows
...
Use os agnostic paths
Get system root from salt config
2017-09-27 16:12:05 -06:00
vernoncole
1f4451faaf
lint and documentation cleanup for vagrant module
2017-09-27 14:59:47 -06:00
vernoncole
88d9e7ed83
replace cache storage with sdb
2017-09-27 14:59:47 -06:00
vernoncole
eb5cd38f85
remove unused keyword argument 'deploy' in tests too
2017-09-27 14:59:47 -06:00
vernoncole
879ae3b291
lint fix round 2
2017-09-27 14:59:47 -06:00
vernoncole
2e162280a9
replace subprocess calls with salt cmd.x calls
2017-09-27 14:59:47 -06:00
vernoncole
7fd1e29ce9
lint fixes
2017-09-27 14:59:47 -06:00
vernoncole
c8a78c7ceb
provide unit tests
2017-09-27 14:59:47 -06:00
vernoncole
2524dd9bba
skeleton unit test
2017-09-27 14:59:47 -06:00
twangboy
16ae8253c1
Mock which, use os.linesep for cmd.run return
2017-09-27 14:41:25 -06:00
