Commit Graph

10485 Commits

Author SHA1 Message Date
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
Nicole Thomas
caa81728a0
Merge pull request #44507 from Ch3LL/pillar_time
Increase sleep timeout for pillar refresh test
2017-11-13 13:29:05 -05: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
Nicole Thomas
1da1a97d7d
Merge pull request #44490 from Ch3LL/ssh_ping
Enable test_deploy ssh test
2017-11-13 12:12:47 -05:00
Ch3LL
ffa4bddcad
Increase sleep timeout for pillar refresh test 2017-11-13 10:50:16 -05:00
Nicole Thomas
18624d6798
Merge pull request #44491 from Ch3LL/ssh_raw
Add salt-ssh raw integration tests
2017-11-13 10:47:11 -05:00
twangboy
2f30ad93b1
Skips mode check in Windows 2017-11-10 14:29:10 -07:00
Ch3LL
3dc8673417
change class name to raw 2017-11-10 14:47:42 -05:00
Ch3LL
308596ac8d
Add salt-ssh raw integration tests 2017-11-10 14:47:38 -05:00
Nicole Thomas
5b95495e75
Merge pull request #44484 from Ch3LL/orch_test
Add orchestration tests when target exists or not
2017-11-10 12:24:21 -07:00
Nicole Thomas
62c42ca6fb
Merge pull request #44480 from Ch3LL/override_pillar
Add integration pillar command line test
2017-11-10 12:14:31 -07:00
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive 2017-11-10 11:48:51 -07:00
Ch3LL
e952cd6712
Enable test_deploy ssh test 2017-11-10 13:35:13 -05: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
Mike Place
cc08ad2edc
Merge pull request #44317 from Ch3LL/ssh_test
Add state tests and state request system to salt-ssh
2017-11-10 11:28:42 -07:00
Ch3LL
f3ec6df76e
Add orchestration tests when target exists or not 2017-11-10 12:00:12 -05:00
Ch3LL
46bce3bd5e
add additional parser argument for ssh integration tests 2017-11-10 10:58:38 -05:00
Ch3LL
e9231430b5
remove logic similar to cloud/proxy tests 2017-11-10 10:48:31 -05:00
Ch3LL
c731eb8ea6
add ssh dir to test runner when --ssh-tests set 2017-11-10 10:48:31 -05:00
Ch3LL
8089a885c2
add wipe function to other run_ssh method 2017-11-10 10:48:31 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables 2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh 2017-11-10 10:48:30 -05:00
Ch3LL
12fed1b4d8
Add integration pillar command line test 2017-11-10 10:43:37 -05: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
Ch3LL
5d1a9af4b5
Add salt-ssh grains.items test 2017-11-08 13:41:11 -05: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
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test 2017-10-31 18:18:37 -04:00
Nicole Thomas
716aabc0bf
Merge branch '2017.7' into service_test 2017-10-29 11:32:33 -04:00
Ch3LL
dd5c823210
remove skipIf import 2017-10-27 15:01:32 -04:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch 2017-10-27 13:03:01 -04: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
Erik Johnson
bd5b9dd0aa Merge pull request #44291 from Ch3LL/pillar_test
add saltutil.refresh_pillar test
2017-10-27 10:19:42 -05:00
Nicole Thomas
e16707c403 Merge pull request #44285 from Ch3LL/all_spm
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Ch3LL
ff92f31cbe
remove skipif for docker 2017-10-26 14:43:31 -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
Ch3LL
c13f37eee4
change service name depending on os 2017-10-26 11:44:38 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd 2017-10-26 10:09:33 -04:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test 2017-10-25 15:56:49 -04:00
rallytime
8237f45a46
Add print_function to __future__ import list 2017-10-25 14:54:03 -04:00
Ch3LL
980c43ebc9
change skip message check to docker 2017-10-25 13:43:13 -04:00
Ch3LL
3955537609
change skip if check to docker 2017-10-25 13:40:58 -04:00
Ch3LL
aa8875a0e2
change service name to docker 2017-10-25 13:39:46 -04:00