Commit Graph

10553 Commits

Author SHA1 Message Date
Mike Place
898c28e6d9
Merge branch '2017.7' into watchin_test 2017-11-20 19:00:45 +00:00
Ch3LL
ca97517795
Add jinja to ssh sls test file 2017-11-20 12:26:09 -05:00
Ch3LL
3df70f3fed
remove iter for watch_in failure test 2017-11-20 11:32:26 -05:00
Ch3LL
ac437ddf90
add order check and remove iter 2017-11-20 11:19:25 -05:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load 2017-11-20 10:59:54 -05:00
Nicole Thomas
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test
Add service.running integration state test
2017-11-16 17:27:56 -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
Ch3LL
7536150567
Add service.running integration state test 2017-11-16 14:12:59 -05:00
Ch3LL
5f2b4f434e
Add watch_in integration test 2017-11-16 12:18:30 -05:00
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests 2017-11-15 11:41:28 -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
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
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
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
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
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
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
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build 2017-10-25 12:09:51 -04:00
Ch3LL
0a387c2ecd
fix pylint 2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test 2017-10-25 12:06:08 -04: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
Mike Place
bd75be24ca Merge pull request #44253 from Ch3LL/spm_install
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50 Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests 2017-10-24 16:59:56 -04:00
Ch3LL
654071028b
change service to crond 2017-10-24 16:26:31 -04:00
Ch3LL
7911b4b3eb
Add service.status integration test 2017-10-24 16:25:19 -04:00
Daniel Wallace
56a3ad8f68
fix pylint comments 2017-10-24 12:18:27 -06:00
Daniel Wallace
4add666db1
add comment to Gemfile and move copyartifacts
moved copyartifacts.py to tests/support

Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
2017-10-24 12:01:57 -06:00
Daniel Wallace
b4c8f7eb57
fix pylint 2017-10-24 10:44:25 -06: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
Daniel Wallace
79251287d0
add logging 2017-10-24 09:23:46 -06:00
Daniel Wallace
38963d5a82
use transport if not set in state_file 2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts 2017-10-24 09:23:46 -06:00
Ch3LL
9e2e785034
add spm tests to test runner 2017-10-24 10:33:53 -04:00
Ch3LL
4729ccd32b
Add multiple spm integration tests 2017-10-23 17:13:32 -04: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
Mike Place
75136152c1 Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py
Fix pickling errors on Windows
2017-10-19 15:36:50 -05:00
Mike Place
5ef124bf2d Merge pull request #44171 from Ch3LL/spm_int
Add SPM Build Integration Tests
2017-10-19 14:49:13 -05: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
Ch3LL
cd79e9444e
remove unneded kwarg 2017-10-18 17:21:52 -04:00