Daniel A Wozniak
136ddf5f54
Finally fix prepend for real
2018-07-13 11:25:27 -07:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test
...
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
2018-07-12 19:04:47 -07:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing
...
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
2018-07-12 11:14:47 -07:00
Nicole Thomas
ad5a959ab9
Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong
...
[2017.7] reset file_roots for renderers after compile_pillar
2018-07-11 09:13:45 -04:00
Daniel Wallace
9ba0f6b3a0
pin pm and grunt packages for npm tests
...
Until at least ubuntu 14 is dead.
2018-07-10 15:03:18 -05:00
Nicole Thomas
16d3daab3c
Merge pull request #48375 from Ch3LL/file_copy
...
Add user and group to makedirs cmd in file.copy
2018-07-10 08:35:10 -04:00
Ch3LL
d16a790775
Add mode to _makedirs call in file.copy
2018-07-09 15:47:37 -04:00
Nicole Thomas
acf42864aa
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown
...
[2017.7] fixes to module/file.py
2018-07-06 14:02:29 -04:00
Nicole Thomas
a7e52f0de2
Merge pull request #48429 from rallytime/bp-46824
...
Back-port #46824 to 2017.7
2018-07-03 17:45:36 -04:00
Daniel A. Wozniak
349a2b279e
Prepend test needs file.touch method
2018-07-03 13:32:02 -07:00
Beorn Facchini
8b4486248d
Added ignore_retcode to mock unit tests
2018-07-03 16:05:04 -04:00
Nicole Thomas
422441505d
Merge pull request #48422 from rallytime/fix-48230
...
Allow file.managed to work with uppercase source_hash in test=true mode
2018-07-03 12:40:58 -04:00
Nicole Thomas
83e387c951
Merge pull request #48410 from dwoz/service_dead_test_fix
...
Fix service dead test on windows
2018-07-03 10:17:28 -04:00
rallytime
4c691ac57a
Add regression test for Issue #48230
...
This also tests the fix for issue #38914
2018-07-02 16:56:49 -04:00
Daniel A. Wozniak
5c0923448d
Fix service dead test on windows
2018-07-02 12:03:03 -07:00
Daniel A. Wozniak
9c7085b70f
Fix file state prepend test
2018-07-02 11:30:55 -07:00
Gareth J. Greenaway
6f11da35a7
Fixing a few things in the new test.
2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
cf747b14ec
Fixing lint issue
2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
16d36c79c8
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.
2018-07-02 11:20:35 -07:00
Daniel Wozniak
10e93bff7f
Merge pull request #48396 from dwoz/symlink_test_fix
...
Fix file.symlink state test for windows
2018-07-02 11:10:31 -07:00
Gareth J. Greenaway
8efd33320f
Normalize the mode before we compare it.
2018-07-02 09:11:42 -07:00
Gareth J. Greenaway
f894f0ecb8
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
2018-07-01 12:33:10 -07:00
Daniel A. Wozniak
d3456d31e6
Fix file.symlink state test for windows
2018-06-30 15:44:58 -07:00
twangboy
77629f640a
Fix module unit tests
2018-06-29 11:15:23 -06:00
Ch3LL
2cbcb4fd26
Add user and group to makedirs cmd in file.copy
2018-06-29 10:39:02 -04: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
