valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,788 Commits 24 Branches 182 Tags 341 MiB
a37a9da1fb
Commit Graph

6351 Commits

Author SHA1 Message Date
rallytime
8025b14584
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/utils/test_parsers.py
 2018-01-04 17:37:48 -05:00
Steve Weber
942c14bb29
pillar body overrides includes 
vars in pillar body override pillar includes
 2018-01-04 17:33:39 -05:00
rallytime
68f971b38f
Apply test fixes from #45034 to parsers_test.py 2018-01-03 15:10:04 -05:00
Nicole Thomas
4f514a29a7
Merge branch '2017.7' into pkg-uptodate 2018-01-02 09:56:28 -05:00
Nicole Thomas
abed378981
Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module 
[2017.7] Fixes to osquery module & addition of unit tests
 2017-12-30 08:25:37 -05:00
Adam Mendlik
29ef67bac2
Test pkg.uptodate with failed upgrades 2017-12-29 07:18:50 -07:00
Adam Mendlik
7c67ec39d9
Add tests for pkg.uptodate state 2017-12-29 07:18:49 -07:00
Gareth J. Greenaway
d834bd1b6f
Fixing some minor lint issues. 2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
4738205154
Fixing a bug when attributes are passed to various osquery module functions. 2017-12-28 17:07:38 -08:00
rallytime
430c913c8c
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/auth/pam.py
  - salt/master.py
  - tests/unit/test_target.py
 2017-12-28 12:15:54 -05:00
Gareth J. Greenaway
0ff811de70
Swapping import to be the old path for 2016.11 2017-12-21 08:17:53 -08:00
Gareth J. Greenaway
b3e2f388f5
Fix to allow nodegroups to include sequences 2017-12-20 16:56:16 -08:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-16 08:16:23 -05:00
twangboy
40665d7b08
Skip test_log_created on Windows 2017-12-13 14:12:07 -07:00
rallytime
a0d2dd2069
Lint fix 2017-12-13 14:06:11 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
Daniel Wallace
66bb755751
add test for effective acls 2017-12-12 09:58:08 -07:00
Frode Gundersen
19a2244cb7
whitelist_acl_test 2017-12-11 18:25:46 +00:00
Nicole Thomas
85160fd297
Merge pull request #44921 from Ch3LL/log_test 
Add test to ensure log files are created
 2017-12-11 13:24:15 -05:00
Ch3LL
3bb58fb577
skip salt-key log creation test 2017-12-11 10:59:10 -05:00
Nicole Thomas
df28f312ac
Merge pull request #44879 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-10 11:53:43 -05:00
Nicole Thomas
f5a143f8c5
Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7 
Bugfix: errors in external pillar causes crash, instead of report of them
 2017-12-08 13:46:55 -05:00
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/file.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2017-12-07 17:33:03 -05:00
Ch3LL
6a379195bc
Add test to ensure log files are created 2017-12-07 17:31:26 -05:00
Nicole Thomas
abe089ad54
Merge pull request #43379 from twangboy/win_fix_file.managed 
Fix file.managed on Windows with test=True
 2017-12-07 16:10:42 -05:00
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed 2017-12-07 10:00:55 -08:00
Daniel Wallace
3f1268d67f
fix patching for python 2.6 2017-12-07 08:25:26 -07:00
Nicole Thomas
7adcfbf8ec
Merge branch '2017.7' into develop2 2017-12-07 10:14:52 -05:00
Nicole Thomas
23d151b40a
Merge pull request #44784 from rallytime/merge-2017.7-1 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-05 12:13:48 -05:00
twangboy
0ff9fa498a
Fix test_directory 2017-12-04 14:05:54 -07:00
twangboy
d5dd42aebe
Fix integration tests for Windows 2017-12-04 14:05:53 -07:00
twangboy
a24b964ea5
Fix unit test to handle new Exception 2017-12-04 14:05:52 -07:00
twangboy
4602f499a2
Remove loader module mixin, add linux paths 2017-12-04 14:05:52 -07:00
twangboy
99b27c037f
Add tests to avoid future regression 2017-12-04 14:05:51 -07:00
Daniel Wallace
1d0bd5bb32
Merge branch '2016.11' into 2016.11 2017-12-04 10:13:15 -07:00
Bo Maryniuk
0d2675c4fe Use variable, instead of direct value 2017-12-04 15:51:56 +01:00
Bo Maryniuk
1ddc47da0a Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors 2017-12-04 15:51:56 +01:00
Bo Maryniuk
68480d5dc9 Add unit test for _get_pillar_errors when both external and internal pillars contains errors 2017-12-04 15:51:56 +01:00
Bo Maryniuk
218a59e93b Add unit test for _get_pillar_errors when external pillar has errors and internal is clean 2017-12-04 15:51:56 +01:00
Bo Maryniuk
3ce19356c2 Add unit test for _get_pillar_errors when external and internal pillars are clean 2017-12-04 15:51:56 +01:00
Bo Maryniuk
67034139d9 Fix unit test: wrong error types in side effect 2017-12-04 15:51:56 +01:00
Bo Maryniuk
d9359bca13 Bugfix: unit test mistakenly expects pillar errors as a string, while it is a list 2017-12-04 15:51:56 +01:00
Nicole Thomas
4ebac09f60
Merge pull request #44735 from gracinet/42713_backport_2017.7 
Backported issue #42713 to 2017.7
 2017-12-03 20:43:22 -05:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file 
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
 2017-12-03 00:01:44 -06:00
twangboy
a5737e8fc3
Fix lint errors 2017-12-01 16:45:18 -07:00
twangboy
be96de09cc
Fix pickling error by decorating 2017-12-01 16:45:18 -07:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files 2017-12-01 14:46:27 -05:00
twangboy
5615862f23
Fix some lint 2017-12-01 10:25:48 -07:00
twangboy
627d5ab0c9
Mock salt.utils.which 
cmd.run return values are mocked
 2017-12-01 10:25:48 -07:00
twangboy
e5a96fe00f
Skip test_fstype on Windows 
no lsblk on Windows
 2017-12-01 10:25:48 -07:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/reg.py
  - salt/modules/state.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_file.py
  - tests/integration/output/test_output.py
  - tests/unit/grains/test_core.py
 2017-12-01 11:12:44 -05:00
Nicole Thomas
d23192c492
Merge pull request #44747 from gtmanfred/roster_defaults 
use a copy so roster_defaults doesn't mangle
 2017-12-01 10:13:47 -05:00
Daniel Wallace
911411ed8f
add unit test 2017-11-30 13:48:30 -07:00
Denys Havrysh
d1f247e49e
Add basic unit tests for schedule util eval func 2017-11-30 12:43:52 +02:00
twangboy
4e0359b603
Skip IPC transport tests in Windows, not supported 2017-11-29 09:19:51 -07:00
Georges Racinet
fb586c6dce
Backported issue #42713 to 2017.7 
Cherry-picked and squashed the two commits from the develop branch
(details at the end of this message)

The unit test module didn't exist at all on 2017.7, hence a conflict during
cherry picking, resolved by introducing only the new tests (the other ones
don't pass as is on 2017.7)

Also, the mock in unit tests for mine.get had to be adapted,
because the return of salt.utils.minions.CkMinions._check_compound_minions()
takes a different form on 2017.7 (just the list of minions).

Original cherry-picked commits:

commit 115ebef6a089dedf8dbadd3b4cca768adbb4a710
Author: Georges Racinet <gracinet@anybox.fr>
Date:   Wed Nov 8 18:02:29 2017 +0100

    Unit test for backwards compatibility of mine.get

    Could not find calls to RemoteFuncs in unit tests, therefore started a
    new one, hope it's in the appropriate place.

    The test replaces the caceh by its own (very limited) one. It's quite
    possible it could be improved by reusing another one meant for unit tests.

commit dc884478399355f3fbea8626a8366b933580dee0
Author: Georges Racinet <gracinet@anybox.fr>
Date:   Mon Oct 30 13:49:13 2017 +0100

    Backwards compat for mine.get on pre-Nitrogen minions

    With this change, the master will accept `expr_form` from
    its minions doing a `mine.get`, which is what minions versions
    before Nitrogen would do. This solves issue #42713.

    In case both `tgt_type` and `expr_form` are present, the former
    gets precedence.

    Performance-wise, this adds a single dict lookup for minions
    running Nitrogen onwards, and two for pre-Nitrogen minions.
    This is, in my opinion, acceptable.
 2017-11-29 16:17:52 +01:00
Erik Johnson
b4eb1527a6
Add test for PR 44335 
This also modifies the virtual_subtype code slightly, due to an issue I
noticed in testing. We were reading from `/proc/1/cgroup` twice (once
for LXC, and then again for Docker).
 2017-11-25 14:32:43 -06:00
Nicole Thomas
6d861f9a74
Disable pylint warning 2017-11-22 10:36:21 -05:00
Mircea Ulinic
3a0945ce3d
Merge pull request #11 from tonybaloney/gh_44332_clone 
Thanks @tonybaloney
 2017-11-22 10:41:01 +00:00
Anthony Shaw
88ef9f18fc
ignore lint error on import 2017-11-22 08:11:07 +00:00
Anthony Shaw
25427d845e
convert key iterator to list as python 3 wont index an iterator 2017-11-22 08:10:36 +00:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load 2017-11-20 10:59:54 -05:00
Nicole Thomas
24b1d7af31
Merge pull request #44518 from twangboy/win_fix_verify_env 
Pass root_dir to the win_verify_env function
 2017-11-16 15:57:48 -05:00
Erik Johnson
958e1aeb8d
Fix test to reflect changes in YAML dumper 
PR #42064 modified the YAML dumper to display unicode text as a unicode
literal rather than with the !!python/unicode extension prefix. This
updates the test to reflect the change in Salt's behavior.
 2017-11-14 13:43:39 -06:00
Ch3LL
9ea4db4224
mock socket.getaddrinfo 2017-11-14 14:39:15 -05:00
Ch3LL
78a07e30f4
add more fqdn tests and remove some of the mocking 2017-11-14 11:39:35 -05:00
Ch3LL
5dbf4144ce
add ipv6 in opts 2017-11-14 11:39:35 -05:00
Ch3LL
eabc1b4f9c
Add fqdn and dns core grain tests 2017-11-14 11:39:31 -05:00
Mircea Ulinic
ba4a62769c
Fix trailing spaces 2017-11-14 09:21:55 +00:00
twangboy
47114fdb30
Pass root_dirs to the win_verify_env function 
Remove while loop that was hanging when `salt` wasn't in the path
Add salt.util.path.safe_path function to check for unsafe paths
Pass root_dir to all calls to `verify_env`
 2017-11-13 13:05:23 -07:00
Mike Place
f9b273a894
Merge pull request #43837 from twangboy/win_unit_test_archive 
Fix `unit.states.test_archive` for Windows
 2017-11-13 12:12:18 -07:00
Mike Place
ebbe5949ea
Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching 
Remove wmi monkeypatching
 2017-11-13 10:38:51 -07:00
Gareth J. Greenaway
4d0806e28c
Merge branch '2017.7' into develop2 2017-11-13 10:29:46 -07:00
Anthony Shaw
ba0280e727
linting updates 2017-11-11 15:25:36 +02:00
Anthony Shaw
78b90f3d0c
add remaining tests 2017-11-11 15:21:24 +02:00
Anthony Shaw
386c4e5791
add tests for all the getters 2017-11-11 14:55:25 +02:00
Sergey Kizunov
4d0d023115
Fix broken beacons_before_connect feature 
The `beacons_before_connect` and `scheduler_before_connect` features
that came from PR #38289 had code that was lost and so the features
don't work. Added them back in and also added unit tests to help
prevent this type of issue in the future.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-11-10 16:26:04 -06:00
twangboy
2f30ad93b1
Skips mode check in Windows 2017-11-10 14:29:10 -07:00
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive 2017-11-10 11:48:51 -07:00
twangboy
6c872e95e6
Add back the setup_loader_modules function 
Use empty dict instead of defining wmi
 2017-11-10 11:30:00 -07:00
Erik Johnson
20273e3697
No need for setup_loader_modules since we're actually importing wmi 2017-11-10 11:29:59 -07:00
twangboy
8c107873cd
Remove wmi monkeypatching 
The WMI object was being monkey patched in the global namespace causing
other tests to fail
 2017-11-10 11:29:54 -07:00
rallytime
9fcc2a70b5
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/modules/test_rh_ip.py
 2017-11-10 10:33:25 -05:00
twangboy
0a9e862bf4
Use regex to split 2017-11-09 16:24:19 -07:00
twangboy
b1dfe9c3c8
Format patching with statements for easier reading 2017-11-09 14:32:21 -07:00
twangboy
ba2f2eb788
Add Erik's changes 2017-11-09 14:32:21 -07:00
twangboy
4ef1e3eb97
Fix unit.states.test_archive for Windows 
Use os agnostic paths
Mock `salt.utils.which` for Windows
Handle urlparse return on Windows
 2017-11-09 14:32:21 -07:00
Sean Jenkins
ed8cccf457
#39901: Fix pylint 2017-11-06 17:02:53 -07:00
Sean Jenkins
43c81dfdee
#39901: Add unit tests 2017-11-06 15:04:22 -07:00
Anthony Shaw
c63222358b
update tests with correct assertions and mock methods on device instance 2017-11-06 05:01:31 +02:00
Anthony Shaw
b69c559c52
fix kwargs typo 
setup basic unit test class

update wrapper
 2017-11-06 04:39:30 +02:00
Nicole Thomas
b2b0c770a4
Merge pull request #44279 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-27 12:17:18 -04:00
twangboy
6db23757bc
Fix test_pydsl on Windows 
Fix salt.utils.fopen to handle the 't' mode correctly in Windows
Fix the test_pysl test issues with spacing and file paths
 2017-10-26 10:18:07 -06:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution 2017-10-25 11:58:44 -04:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - .gitignore
  - tests/unit/states/test_file.py
 2017-10-25 10:04:08 -04:00
twangboy
609361bf48
Fix some lint errors 2017-10-24 09:27:39 -06:00
twangboy
7a3ff9387d
Mock the rest of the tests 2017-10-24 09:27:38 -06:00
Erik Johnson
5ce14df82c
Change how members are retrieved in win_groupadd 
This is a solution that works for the other functions that interact with
group objects, making it a better overall solution to be used widely
in win_groupadd.

This also updates the mocking in the tests such that we use a more
comprehensive fake class, and more intelligent mocking of get_sam_name
using a lambda.
 2017-10-24 09:27:38 -06:00
twangboy
6ab82394be
Set up mocking 
Move the code that sets up the group object, computer object and gets
existing members out of the individual functions so they can be mocked

Mock the GroupObj
Mock the ComputerObj
Mock existing members
Still need to fix info, getent, and members
 2017-10-24 09:27:37 -06:00
Nicole Thomas
304dd2529d Merge pull request #44160 from gtmanfred/directory 
add changes to test return
 2017-10-23 10:35:20 -04:00
Nicole Thomas
c6d27ada51 Merge pull request #43843 from twangboy/win_unit_test_mount 
Fix `unit.states.test_mount` for Windows
 2017-10-20 10:27:25 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test 2017-10-20 08:11:44 -06:00
twangboy
a862e0bf2d
Remove unneeded import 2017-10-19 13:30:16 -06:00
twangboy
d78f27466d
Fix unit.states.test_mount for Windows 
Use `os.path.realpath` to convert paths
Mock `os.path.exists`
 2017-10-19 13:30:16 -06:00
twangboy
64d2e4f732
Fix pickling errors on Windows 
Moves the 4 sub functions to the global scope
 2017-10-19 11:50:23 -06:00
Daniel Wallace
ac0b5ec440
fix test 2017-10-19 09:28:59 -06:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth 2017-10-18 14:03:10 -06:00
Mike Place
afcaa0c591 Merge pull request #43913 from twangboy/win_fix_test_jinja 
Fix `unit.templates.test_jinja` for Windows
 2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1 Merge pull request #43917 from twangboy/win_unit_test_pillar 
Fix `unit.test_pillar` for Windows
 2017-10-17 15:06:45 -06:00
Matthew Summers
bebf301976
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 16:35:57 -04:00
Nicole Thomas
68974aa74d Merge pull request #44029 from msummers42/2017.7 
addresses issue #43307, disk.format_ to disk.format
 2017-10-16 15:59:19 -04:00
Nicole Thomas
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers 
Return multiprocessing queue in LogSetupMock class
 2017-10-16 14:14:29 -04:00
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows 
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
 2017-10-16 10:41:36 -06:00
Matthew Summers
16e1c1dfc8
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 09:47:40 -05:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests 2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class 2017-10-13 15:47:19 -06:00
twangboy
00dbba5712
Fix unit.test_pillar for Windows 
Use delete=True in NamedTemporaryFile command otherwise the handle to
the file isn't released and the file can't be opened by the actual test.
 2017-10-10 13:44:58 -06:00
Erik Johnson
92e05cf1c0
Don't allow path separators in minion ID 2017-10-10 11:03:29 -04:00
Erik Johnson
19481423dd
Don't allow path separators in minion ID 2017-10-10 10:58:42 -04:00
twangboy
254dac7723
Fix unit.utils.test_utils for Windows 
Use os agnostic path seps
Mock sys.platform to not return win
 2017-10-05 16:47:32 -06: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
Erik Johnson
5d56a03a67
Improve failures for module.run states 
Bare asserts are zero help in troubleshooting. This commit changes the
tests that uses bare asserts such that they fail with a useful error
mesage as well as the return data from the module.run call.
 2017-10-02 10:48:45 -05:00
twangboy
fd1d6c31de
Fix unit.states.test_augeas for Windows 
Mock `os.path.isfile` so the test will continue
 2017-09-29 12:52:32 -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
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
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
twangboy
16ae8253c1
Mock which, use os.linesep for cmd.run return 2017-09-27 14:41:25 -06:00
twangboy
a64fe75816
Use os agnostic paths 2017-09-27 14:16:39 -06:00
Nicole Thomas
3f888753d4 Merge pull request #43732 from twangboy/win_skip_mac_pkg_tests 
Skip `unit.stats.test_mac_packages` on Windows
 2017-09-27 10:48:07 -04:00
twangboy
b41b9c8378
Skip snapper tests on Windows 2017-09-26 17:12:37 -06:00
twangboy
1c01e06097
Only skip test on Windows 2017-09-26 14:36:12 -06:00
twangboy
ec99a3ce3c
Fix lint error 2017-09-26 14:36:11 -06:00
twangboy
61f8a2f7ff
Skip mac specific tests 2017-09-26 14:36:11 -06:00
Nicole Thomas
2581098595 Merge pull request #43731 from twangboy/win_unit_beacons_test_status 
Fix `unit.beacons.test_status` for Windows
 2017-09-26 12:25:11 -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
twangboy
922e60fa67
Add os agnostic paths 2017-09-25 15:25:31 -06:00
twangboy
dc1b36b7e2
Change expected return for Windows 2017-09-25 15:06:44 -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
rallytime
cbae45bec4
Lint: Remove extra line at end of file 2017-09-22 10:33:10 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify 
Fix `unit.utils.test_verify` for Windows
 2017-09-21 16:26:12 -06:00
Jochen Breuer
96f39a420b Fixed linting 
Fix for "String format call with un-indexed curly braces".
 2017-09-20 16:35:01 +02:00
Jochen Breuer
08fba98735 Fixed several issues with the test 
* Removed redundant import.
* No longer inheriting from LogSettingsParserTests.
* Replaced test class description with somethin meaninful.
* Fixed identation.

I've also moved the class to the bottom, since all the classes inheriting
from LogSettingsParserTests are in the block above.
 2017-09-20 15:37:24 +02:00
Jochen Breuer
3a089e450f Added tests for pid-file deletion in DaemonMixIn 
This is a follow up on this PR:
https://github.com/saltstack/salt/pull/43366

Since we can get an OSError durin PIDfile deletion with non-root users, it
would make sense to also test for this. So here are the two test cases.
One with an OSError and the other one without.
 2017-09-20 14:34:30 +02:00
Jochen Breuer
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-19 10:44:31 +02:00
Nicole Thomas
9ada7f626c Merge branch '2017.7' into win_fix_unit.utils.test_verify 2017-09-13 14:22:38 -04:00
Erik Johnson
4243a2211d Rewrite the reactor unit tests 
These have been skipped for a while now because they didn't work
correctly. The old tests have been scrapped in favor of new ones that
test both the old and new config schema.
 2017-09-13 10:35:23 -05:00
Mike Place
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2017-09-11 15:34:02 -06: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
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
twangboy
c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows 2017-09-11 12:22:06 -06:00
twangboy
e496d28cbf Fix unit.utils.test_verify for Windows 
Use Windows api to get and set the maxstdio
Change messages to work with Windows
 2017-09-11 12:22:06 -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
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Mike Place
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2 
Fix `unit.cloud.clouds.test_ec2` for Windows
 2017-09-11 09:17:19 -06: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
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -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
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd 
Fix `unit.modules.test_qemu_nbd` for Windows
 2017-09-08 09:34:57 -04:00
Alessandro -oggei- Ogier
70642e495d better qemu_static parameter mangle in deboostrap management, tests 2017-09-08 10:17:32 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows 
Use os.sep
 2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows 
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
 2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows 
Mocks os.path.exists
 2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Nicole Thomas
6106aec696 Merge pull request #43356 from gtmanfred/2016.11 
never-download got readded
 2017-09-07 13:46:04 -04:00
Nicole Thomas
3f19b247f3 Add handler.messages back in for test comparison 2017-09-07 11:51:39 -04:00
Jochen Breuer
20619b24c4
Fixed test for delete_deployment 
Due to implementation change, we need to mock the return value.
 2017-09-07 10:20:46 +02:00
twangboy
a909813fa5 Remove unused import (lint) 2017-09-06 15:56:24 -06:00
twangboy
3ef8d714cb Fix unit tests to mock salt.utils.path.readlink 2017-09-06 13:03:14 -06:00
twangboy
7c4460164b Fix alternatives for Windows 
Not sure this is necessary... I don't think alternatives is a thing in
Windows. Anyway, it uses `__salt__['file.readlink']` instead of
`os.readlink` as there is no `os.readlink` in Windows.
Modifies the tests to mock `__salt__['file.readlink']` instead of
`os.readlink`
 2017-09-06 13:03:14 -06:00
Nicole Thomas
5111cf8bad Merge branch '2016.11' into 43086-no-member 2017-09-06 10:41:18 -04:00
twangboy
a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original 2017-09-05 17:03:50 -06:00
twangboy
6263bc8983 Remove print statement 2017-09-05 16:48:58 -06:00
twangboy
79cd3831ae Fix empty value preserved test 2017-09-05 16:44:12 -06:00
twangboy
85997391f1 Is this handled the same on Linux and Windows 2017-09-05 16:32:43 -06:00