Commit Graph

4113 Commits

Author SHA1 Message Date
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014 2018-07-24 11:07:14 -06:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file 2018-07-24 16:42:07 +00:00
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
2018-07-23 18:32:56 -04:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path 2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests 2018-07-23 14:05:31 -04:00
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod
Add windows ip module integration tests
2018-07-20 10:57:44 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac
[2017.7] Fix service.disabled test for macosx
2018-07-20 10:32:55 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port
Use different pub and ret ports for testprogram integration tests
2018-07-20 10:11:51 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00
Ch3LL
f60d21bda4
reverse assertion order for service disable test 2018-07-19 10:29:18 -04:00
Ch3LL
3727d1b3b9
switch try/except to match 2018.3 2018-07-18 18:05:17 -04:00
Ch3LL
fb953c2369
[2017.7] Fix service.disabled test for macosx 2018-07-18 17:58:44 -04:00
Ch3LL
90c3f568b1
Add windows ip module integration tests 2018-07-18 13:58:17 -04:00
Nicole Thomas
5391dd0a8d
Merge pull request #48584 from Ch3LL/mac_user_grp
Fix grp import for mac in test_user integration test
2018-07-16 15:28:12 -04:00
Nicole Thomas
61572b6780
Merge pull request #48555 from Ch3LL/ssh_id
Fix state.sls_id not running on ssh minion
2018-07-16 09:24:41 -04:00
Ch3LL
585ee9db90
Fix grp import for mac in test_user integration test 2018-07-13 16:25:28 -04:00
Ch3LL
4ba2299a87
import flaky decorator on mac tests 2018-07-13 15:16:06 -04:00
Ch3LL
811220b41e
Add flaky decorator to mac_system and mac_timezone tests 2018-07-13 14:40:26 -04:00
Ch3LL
f69932f506
fix pylint 2018-07-12 12:37:24 -04:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04: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
rallytime
4c691ac57a
Add regression test for Issue #48230
This also tests the fix for issue #38914
2018-07-02 16:56:49 -04: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
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
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
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07: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
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
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
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