Commit Graph

101793 Commits

Author SHA1 Message Date
Gareth J. Greenaway
c65c5d532a
Skip the test test_issue_2594_non_invalidated_cache on MacOS where it is flakey. 2019-07-18 15:59:02 -07:00
Daniel Wozniak
b091eb7895 Merge pull request #53902 from twangboy/skip_dt
Skip tests that modify date or time
2019-07-18 10:53:23 -07:00
Daniel Wozniak
22b7b1a9ef
Merge pull request #53901 from s0undt3ch/hotfix/wrap-coverage-combine
[2019.2.1] Don't fail when combining coverage files
2019-07-18 10:46:31 -07:00
Daniel Wozniak
84e798a82d
Merge pull request #53542 from dwoz/tcp_leak
Fix leak of SaltMessageClient instances when using tcp transport
2019-07-18 10:44:43 -07:00
twangboy
76cf936aa1
Skip tests that modify date or time 2019-07-18 11:40:31 -06:00
Pedro Algarvio
b459a482a0
Don't fail when combining coverage files 2019-07-18 18:20:19 +01:00
Pedro Algarvio
3daeb4f168
Update TCP pipelines 2019-07-17 09:17:59 +01:00
Pedro Algarvio
52f95568b1
Merge branch '2019.2.1' into tcp_leak 2019-07-17 09:11:14 +01:00
Daniel A. Wozniak
f5313fd17d Fix tcp message client test 2019-07-17 03:46:09 +00:00
Daniel Wozniak
61e9efd7e0
Merge pull request #53873 from bryceml/2019.2.1-increase-sleep
increase sleep time between kitchen create failures to account for ap...
2019-07-16 16:46:08 -07:00
Daniel Wozniak
317d9af694
Merge pull request #53750 from twangboy/fix_helpers
Fix memory error when the test suite cleans up (2019.2.1)
2019-07-16 16:00:06 -07:00
Bryce Larson
aae0bf64d6
increase sleep time between kitchen create failures to account for api limits 2019-07-16 12:12:35 -06:00
Daniel Wozniak
fa0e9c3311
Merge branch '2019.2.1' into fix_helpers 2019-07-16 09:11:23 -07:00
Daniel Wozniak
6c2b3a5da5
Merge pull request #53851 from dwoz/master_stats_revert
Master stats revert
2019-07-16 09:05:36 -07:00
Daniel A. Wozniak
0bc72e4644
Revert "Merge pull request #53822 from dwoz/master_stats_test"
This reverts commit ba33d76148, reversing
changes made to 1756156aee.
2019-07-15 10:01:32 -07:00
Daniel A. Wozniak
4553ba770a
Revert "Merge pull request #53829 from saltstack/fix_stats_2019.2.1"
This reverts commit 5064027b9d, reversing
changes made to 971eda38ff.
2019-07-15 10:00:06 -07:00
Daniel Wozniak
5064027b9d
Merge pull request #53829 from saltstack/fix_stats_2019.2.1
Fix stats on windows
2019-07-11 18:03:46 -07:00
Daniel A. Wozniak
9f2d20ddb0
Fix stats on windows 2019-07-11 17:56:09 -07:00
David Murphy
971eda38ff
Merge pull request #53826 from dmurphy18/fedora30_fixes
WAR ROOM test skip till rewritten to allow for dnf on RHEL 8 and F30
2019-07-11 18:39:10 -06:00
David Murphy
34b261dcc1 WAR ROOM test skip till rewritten to allow for dnf on RHEL 8 and Fedora 30 2019-07-11 18:06:12 -06:00
Pedro Algarvio
ba33d76148
Merge pull request #53822 from dwoz/master_stats_test
Enable master stats for tests
2019-07-11 17:37:54 -06:00
Daniel A. Wozniak
d2b8315001
Enable master stats for tests 2019-07-11 16:26:13 -07:00
twangboy
34714221c4
Fix memory error when the test suite cleans up 2019-07-08 16:33:46 -06:00
Shane Lee
1756156aee
Merge pull request #53591 from twangboy/fix_boto_tests
Fix whitelist errors in `test_boto_*` state tests on Windows
2019-07-06 23:45:20 -06:00
Shane Lee
ba8ba26232
Merge branch '2019.2.1' into fix_boto_tests 2019-07-06 23:45:06 -06:00
Shane Lee
464464cd15
Merge pull request #53688 from twangboy/mf_53662
Merge Forward #53662 (2019.2.1)
2019-07-06 23:44:24 -06:00
Shane Lee
c19dc97ca5
Merge branch '2019.2.1' into mf_53662 2019-07-06 23:44:07 -06:00
Daniel Wozniak
1a76e00e14
Merge pull request #52401 from rsmekala/2019.2.1
Port Junos-related bug fixes from develop to 2019.2
2019-07-06 14:50:50 -07:00
Shane Lee
b9033b9a2c
Merge branch '2019.2.1' into mf_53662 2019-07-06 09:16:36 -06:00
Shane Lee
8ace391f6f
Merge branch '2019.2.1' into fix_boto_tests 2019-07-06 09:16:28 -06:00
Shane Lee
056f5967da
Merge pull request #53585 from twangboy/fix_test_winrepo
Fix `test_winrepo` on Windows
2019-07-06 09:15:46 -06:00
Shane Lee
c1f8cbacbe
Merge branch '2019.2.1' into fix_test_winrepo 2019-07-06 09:15:33 -06:00
Shane Lee
db950f25e1
Merge pull request #53590 from twangboy/fix_test_status
Fix `test status` on Windows
2019-07-06 09:15:12 -06:00
Shane Lee
67750b7813
Merge branch '2019.2.1' into fix_test_status 2019-07-06 09:15:00 -06:00
Shane Lee
91da774089
Merge branch '2019.2.1' into fix_test_winrepo 2019-07-06 09:13:41 -06:00
Shane Lee
becaf12983
Merge pull request #53556 from twangboy/fix_test_pillar
Fixes an issue with line endings in the jinja renderer
2019-07-05 17:06:00 -06:00
Shane Lee
ac405d1226
Merge branch '2019.2.1' into fix_test_pillar 2019-07-05 17:05:37 -06:00
twangboy
75e740eac8
Merge forward #53662 2019-07-05 16:53:51 -06:00
Shane Lee
7a5111b40c
Merge pull request #53557 from twangboy/fix_test_pydsl
Fix test_pydsl on Windows
2019-07-05 16:36:40 -06:00
Shane Lee
d9df951fa6
Merge branch '2019.2.1' into fix_test_pydsl 2019-07-05 16:36:27 -06:00
Gareth J. Greenaway
c8c8bc078c
Merge branch '2019.2.1' into fix_test_winrepo 2019-07-05 13:45:16 -07:00
Gareth J. Greenaway
b66704503d
Merge branch '2019.2.1' into fix_test_status 2019-07-05 13:44:58 -07:00
Gareth J. Greenaway
62041eb3a2
Merge branch '2019.2.1' into fix_boto_tests 2019-07-05 13:25:19 -07:00
Gareth J. Greenaway
345938d82d
Merge branch '2019.2.1' into 2019.2.1 2019-07-05 13:23:25 -07:00
Pedro Algarvio
8f05226fd2
Merge pull request #53653 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1
[2019.2.1] Log which address failed to resolve
2019-07-05 19:29:30 +01:00
Pedro Algarvio
f750f44c26
Merge pull request #53725 from s0undt3ch/features/f30-reqs-2019.2.1
[2019.2.1] Archive the kitchen logs
2019-07-05 19:19:49 +01:00
Pedro Algarvio
118fbf74a5
Improve slack message 2019-07-05 17:15:50 +01:00
Pedro Algarvio
62a2ee8773
Archive the kitchen logs 2019-07-05 16:29:01 +01:00
Daniel Wozniak
326f9f4d27
Merge branch '2019.2.1' into 2019.2.1 2019-07-05 08:22:22 -07:00
Pedro Algarvio
f44253c599
Merge branch '2019.2.1' into hotfix/fix-nox-bypass-2019.2.1 2019-07-05 16:12:01 +01:00