Commit Graph

11191 Commits

Author SHA1 Message Date
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012
add service enabled test
2018-07-23 11:38:48 -04:00
Mike Place
689c231d2b
Merge pull request #48691 from Ch3LL/win_repo_pkg_test
Add windows pkg module integration tests
2018-07-22 14:01:29 -06:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Nicole Thomas
85991680c8
Merge pull request #48345 from twangboy/fix_48169
Fix behavior of powercfg module and state
2018-07-20 13:37:12 -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
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -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
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable
Fix mac service.disable tests
2018-07-20 10:09:40 -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
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00: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
William Yardley
7ff3c9c5ff
Improve handling of npm json output (#43138)
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
2018-07-18 21:42:28 -07: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
Nicole Thomas
aa6dcf39e8
Merge pull request #48583 from Ch3LL/mac_flaky_tests
Add flaky decorator to mac_system and mac_timezone tests
2018-07-13 15:56:39 -04:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version
Fix behaviour of function latest_version in zypper module when multip…
2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -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
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
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02: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
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
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