Commit Graph

11133 Commits

Author SHA1 Message Date
twangboy
32c5014eb6
Fix unit tests 2018-06-27 16:06:57 -06:00
Nicole Thomas
21ed5b97ce
Merge pull request #48295 from rallytime/bp-48193
Back-port #48193 to 2017.7
2018-06-26 19:42:17 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189
Back-port #48189 to 2017.7
2018-06-25 15:26:55 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case
Without this option we aren't really a syndic and it won't wait
2018-06-25 10:26:30 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Nicole Thomas
3327181507
Merge pull request #48234 from dwoz/thin_dir
Fix py2 thin dir issues
2018-06-25 09:33:01 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs
Add "sync_mods" argument to state.apply/state.sls
2018-06-21 15:57:02 -04:00
Erik Johnson
8b1bd0eda2
Update test to reflect changed argument name 2018-06-21 11:39:12 -05:00
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07:00
Ch3LL
236773e3e9
Skip new sha256 files on repo.saltstack.com/windows 2018-06-20 14:28:31 -04:00
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
2018-06-19 14:09:11 -04:00
Nicole Thomas
e079fce38d
Merge pull request #48190 from terminalmage/fix-vfstab-test
Fix mount.vfstab unit test
2018-06-18 17:47:54 -04:00
Erik Johnson
8d70d14362
Fix mount.vfstab unit test
This test was calling mount.fstab() instead of mount.vfstab()
2018-06-18 13:21:40 -05:00
Erik Johnson
9af09e0127
Mock config.get due to changes in _refresh_mine_cache 2018-06-18 00:05:25 -05:00
Erik Johnson
d403ae58d7
Add unit test for docker.update_mine 2018-06-17 21:42:28 -05:00
Nicole Thomas
df2a156338
Merge pull request #48061 from garethgreenaway/port_47049_2017_7
[2017.7] Porting #47049 to 2017.7.
2018-06-15 13:15:49 -04:00
Ch3LL
48b5d2e9d3
Add timeout argument to run_salt for ShellCase 2018-06-14 16:19:33 -04:00
Gareth J. Greenaway
7c472fed51
Fixing failing test_set_hwclock_aix test. 2018-06-13 10:15:28 -07:00
Gareth J. Greenaway
ccb0acc958
Porting #47049 to 2017.7. 2018-06-13 10:15:28 -07:00
Erik Johnson
6fe711ad76
Reverse monkeypatching after test_symlink_list finishes
On Windows, in test_symlink_list we monkeypatch the file_roots. However,
we don't ever reverse that monkeypatching.

This would not have affected other test classes, because the opts we are
monkeypatching are ones created specifically for that test class. And
due to the lexicographic order in which the tests are run,
test_symlink_list is run last. However, if we were to ever add a test to
that test class which would run after test_symlink_list, it would be
affected by the monkeypatching.
2018-06-13 09:58:29 -05:00
Erik Johnson
cb8e6f9fb8
Remove redundant mocking
This mocking was added to setup_loader_modules and is no longer needed
in individual tests.
2018-06-08 12:26:31 -05:00
Erik Johnson
bc3ad795e9
Add test for sync argument to state.sls 2018-06-08 12:22:50 -05:00
Nicole Thomas
871a910fcb
Merge pull request #48009 from dwoz/winswarmfix
minionswarm runs on windows
2018-06-08 09:52:35 -04:00
Nicole Thomas
0dcaead36d
Merge pull request #47968 from gtmanfred/2017.7
Clean up tox + pytest
2018-06-06 17:23:51 -04:00
Daniel A Wozniak
5027c7bb84
minionswarm runs on windows 2018-06-06 14:19:16 -07:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg
Add try/finally, fix typo in 7zip def file
2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service
Fix failing test when service doesn't exist
2018-06-06 15:05:42 -04:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests 2018-06-06 12:22:22 -05:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -07:00
Daniel Wallace
556a2067fc
fix masterapi test to use testing directory for configs 2018-06-05 18:36:27 -05:00
Daniel Wallace
5a41f484ef
add EXPENSIVE_TESTS 2018-06-05 18:36:27 -05:00
Daniel Wallace
055cd5a6ba
set DESTRUCTIVE_TESTS environment variable for pytest 2018-06-05 18:36:27 -05:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
twangboy
0cd47aa81e
Remove unused import 2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist 2018-06-04 18:09:12 -06:00
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs
Clean up doc build warnings, add best practices for writing states
2018-06-01 10:42:54 -04:00
Daniel Wallace
735e92093e
Merge pull request #47917 from dwoz/winsuite
Fix windows tests suite breakage
2018-06-01 06:42:14 -05:00
Daniel A Wozniak
118601ebd6
Fix windows tests suite breakage 2018-05-31 23:17:18 -07:00
Erik Johnson
8cb33d3dec
Quiet the linter
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module 2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
Nicole Thomas
63efb76d51
Merge pull request #47822 from Ch3LL/win_user_test
Add user state integration tests to windows
2018-05-30 17:13:06 -04:00
Ch3LL
3a691b405f
add user_home path for both windows and linux 2018-05-30 14:22:10 -04:00
Frode Gundersen
38d114a2d2
add whoami test 2018-05-29 21:51:02 +00:00
Daniel A. Wozniak
c2f8aef7c5
Fix for py3 ec2 cloud tests 2018-05-27 14:09:50 -07:00
Nicole Thomas
0bf651b470
Merge pull request #47846 from Ch3LL/p_refresh_test
Fix flaky refresh pillar integration test
2018-05-25 16:50:48 -04:00
Nicole Thomas
799fce979d
Merge pull request #47552 from twangboy/fix_46981
Show GPO settings, raise error if trying to set gpo managed settings
2018-05-25 16:41:21 -04:00