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
87,619 Commits 24 Branches 182 Tags 341 MiB
8f7ef4f45f
Commit Graph

3382 Commits

Author SHA1 Message Date
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
vernoncole
52acfd980d merge upstream develop 2017-09-27 14:26:32 -06:00
twangboy
a64fe75816
Use os agnostic paths 2017-09-27 14:16:39 -06:00
Nicole Thomas
e4be436ca1 Merge pull request #43674 from alexbleotu/storage_policies-gh 
VMware vCenter proxy + storage policies states & dependencies
 2017-09-27 14:56:39 -04:00
Nicole Thomas
92c10689e4 Merge pull request #43757 from eradman/is_windows 
Fix DeprecationWarning for use of 'salt.utils.is_windows'
 2017-09-27 10:47:20 -04:00
Nicole Thomas
a48afa7175 Merge pull request #43763 from twangboy/win_fix_test_disk 
Fix `unit.modules.test_disk` for Windows
 2017-09-27 10:32:41 -04:00
twangboy
b41b9c8378
Skip snapper tests on Windows 2017-09-26 17:12:37 -06:00
twangboy
35505ac966
Honor 80 char limit 2017-09-26 15:52:04 -06:00
twangboy
26b23b37bc
Skip test if missing binaries 2017-09-26 15:51:22 -06:00
Eric Radman
617c5b72ac Fix DeprecationWarning for use of 'salt.utils.is_windows' 2017-09-26 15:13:18 -04:00
rallytime
74d315fd28
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/file.py
  - tests/unit/modules/test_file.py
 2017-09-26 13:45:10 -04:00
Nicole Thomas
10f3d47498 Merge pull request #43724 from brejoc/2017.7.kubernetes_delete_test 
Improved delete_deployment test for kubernetes module
 2017-09-26 12:19:30 -04:00
Nicole Thomas
13cc27bdab Merge pull request #43734 from twangboy/win_unit_test_poudriere 
Fix `unit.modules.test_poudriere` for Windows
 2017-09-26 10:13:46 -04:00
Erik Johnson
d78b9a3294 Merge pull request #41998 from twangboy/win_unit_test_environ 
Fix `unit.modules.test_environ` for Windows
 2017-09-26 07:25:48 -05:00
Alexandru Bleotu
b6577e4328 pylint 2017-09-25 18:25:04 -04:00
Alexandru Bleotu
58445e927b Updated all vsphere tests to support the vcenter proxy 2017-09-25 18:24:51 -04:00
twangboy
922e60fa67
Add os agnostic paths 2017-09-25 15:25:31 -06:00
Erik Johnson
5b3be6e8af
Fix failing unit test 2017-09-25 16:06:33 -05:00
twangboy
d73ef44cf6
Mock with uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
048e16883f
Use uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
056f3bb4c0
Use with to open temp file 2017-09-25 09:35:25 -06:00
twangboy
716e99c453
Fix py3 bytestring problems 2017-09-25 09:35:24 -06:00
twangboy
543610570c
Fix bytestring issues, fix errored tests 2017-09-25 09:35:24 -06:00
twangboy
9fe83a34a5
Remove old variable declaration 2017-09-25 09:35:23 -06:00
twangboy
c5cf5e92c1
Fix many tests 2017-09-25 09:35:23 -06:00
Jochen Breuer
85b0a8c401 Improved delete_deployment test for kubernetes module 
This is a follow up of this PR: https://github.com/saltstack/salt/pull/43235

With the fix in PR 43235, we are polling the status of the deletion via
show_deployment. This is now also reflected in the tests with this change.
 2017-09-25 17:29:27 +02:00
Mike Place
cae79d2020 Merge pull request #43699 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-24 19:27:17 -06:00
Mike Place
75dd97ee50 Merge pull request #43645 from alexbleotu/cluster_states-gh 
VMware cluster states + dependencies
 2017-09-22 11:46:25 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
Mike Place
ed22e0f2fd Merge pull request #43507 from rallytime/replace-utils-calls 
Update which and is_windows calls to use new paths
 2017-09-21 14:11:21 -06:00
Alexandru Bleotu
71b10b81f9 Added tests for salt.modules.vspere.rename_datastore 2017-09-20 06:28:26 -04:00
Jochen Breuer
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-19 10:44:31 +02:00
rallytime
9afc84091d Update which and is_windows calls to use new paths 2017-09-15 17:27:02 -04:00
Alexandru Bleotu
d9b5424aab Merge branch 'develop' into list_cluster-gh 2017-09-15 20:04:33 +01:00
Mike Place
a1b871304b Merge pull request #43345 from ribx/develop 
better atom extraction from portage version string
 2017-09-15 12:29:25 -06:00
Mike Place
b262695301 Merge pull request #43493 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-15 12:23:09 -06:00
Alexandru Bleotu
c3d6af502b Added tests for modules.vsphere.list_cluster 2017-09-14 12:47:34 -04:00
rallytime
75abf0a2a9 Test fix: update mock util path 2017-09-14 11:01:06 -04:00
Alexandru Bleotu
15a2499d27 Added tests for salt.vsphere._get_proxy_target 2017-09-14 10:52:28 -04:00
Nicole Thomas
aee52a20e0 Lint: Add empty line at end of file 2017-09-14 09:48:09 -04:00
Robin Lutz
e1428dec5f corrected some PEP8 problems reported by jenkins 2017-09-14 14:24:54 +02:00
Nicole Thomas
f8ef7dce40 Merge pull request #43469 from alexbleotu/test_fixes-gh 
Fixed several tests
 2017-09-13 15:53:53 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
Alexandru Bleotu
449dccdaa1 pylint 2017-09-13 05:13:01 -04:00
Alexandru Bleotu
0222a5a056 Fix to vsphere tests 2017-09-12 18:43:08 -04:00
Alexandru Bleotu
afa4921d37 Fixed vsphere tests to support the esxcluster proxy 2017-09-12 18:43:05 -04:00
Alexandru Bleotu
26710fa8fc Added tests for esxcluster execution module 2017-09-12 18:42:58 -04:00
Alexandru Bleotu
f11a618274 Fixed Linux sysctl tests to be run in a local environment 2017-09-12 18:27:28 -04:00
Alexandru Bleotu
4cadfdcb56 Updated kubernetes tests to be skipped if library is not loaded 2017-09-12 18:27:23 -04:00
ribx
b712f971f7 Merge branch 'develop' into develop 2017-09-12 11:49:29 +02:00
Mike Place
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts 
Fix `unit.modules.test_hosts` for Windows
 2017-09-11 15:28:41 -06:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 15:18:40 -06:00
Mike Place
e7a411c7f4 Merge pull request #43252 from rallytime/utils-files-moves 
Move salt.utils.istextfile to salt.utils.files.is_text_file
 2017-09-11 12:42:40 -06:00
rallytime
5413a5337e Lint: remove unused import 2017-09-11 14:34:20 -04:00
Mike Place
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-11 12:33:38 -06:00
Mike Place
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives 
Fix `unit.modules.test_alternatives` for Windows
 2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests 
Fix `unit.modules.test_ini_manage` for Windows
 2017-09-11 11:10:30 -06:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
Mike Place
2964707e5d Merge pull request #43341 from ixs/fedora-rh_ip 
Fix rh_ip template use for Fedora
 2017-09-11 10:30:53 -06:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Mike Place
9f421dde89 Merge pull request #43370 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 09:38:20 -06:00
rallytime
e11aa7e5ef Adjust test mocking to handle __utils__['files.is_text_file'] 2017-09-11 10:25:00 -04:00
twangboy
90dcf8287c Fix unit.modules.test_hosts for Windows 
Fix problem with TmpStringIO Class on Windows. The module uses this
class twice in normal operation. In Windows there's an additional run
before the real runs where it is opened with mode='w'. This causes the
data to be wiped out. So, this sets it to only save the value in the
instance to data if it is not empty.

Use the windows path to the hosts file in Windows
 2017-09-08 17:21:01 -06:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows 
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
 2017-09-08 15:53:07 -06:00
Alessandro -oggei- Ogier
496f14a7e7 forgot to mock the proper one 2017-09-08 21:37:09 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group 
Fix `unit.modules.test_pw_group` for Windows
 2017-09-08 09:35:44 -04:00