 Pedro Algarvio
|
6892e3af3a
Move windows test white listing to pytest markers
|
5 éve |
|
Daniel Wozniak
|
ca6ae1d5f8
Merge pull request #55718 from dwoz/flaky_win_test
|
5 éve |
|
Daniel A. Wozniak
|
1dea4d4d0d
Reduce flakiness in test on windows
|
5 éve |
|
Akmod
|
3c17b30ce8
Merge branch 'master' into port-51846
|
5 éve |
|
Akmod
|
f9c0518774
Merge branch 'master' into port-51846
|
5 éve |
|
Megan Wilhite
|
325af23081
Merge branch 'master' into mf-master
|
5 éve |
|
Matt Phillips
|
2202fedbbf
address circular reference in LazyLoader with ThreadLocalProxy
|
5 éve |
|
ch3ll
|
33bc5bd840
Merge remote branch 'upstream/master' into mf-master
|
5 éve |
|
ch3ll
|
8ca43b0a0d
Merge branch 'upstream/master' into mf-master
|
5 éve |
|
Pedro Algarvio
|
ac0db895ab
Prefer `RUNTIME_VARS` usage
|
6 éve |
|
Tyler Johnson
|
f2c8654791
Merge branch 'master' of https://github.com/saltstack/salt into HEAD
|
5 éve |
|
Daniel A. Wozniak
|
60b4db3ac1
Fix un-used import
|
5 éve |
|
Daniel A. Wozniak
|
2f5f787f65
Less flaky retry tests
|
5 éve |
|
Akmod
|
5d9e3cb97f
Merge branch 'master' into port-51846
|
5 éve |
|
Ch3LL
|
46fc085708
Merge remote-tracking branch master into mf-master
|
5 éve |
|
Tyler Johnson
|
61c77a3802
skip tests on appropriate platforms
|
5 éve |
|
Ch3LL
|
355551c83b
Merge remote-tracking branch 2018.3 into master
|
5 éve |
|
Daniel Wozniak
|
1dfcb2755a
Merge pull request #51846 from gtmanfred/develop
|
5 éve |
|
Ch3LL
|
96540be449
Clean up files after state.show_states test
|
5 éve |
|
Ch3LL
|
ad265ae29c
Fix state.show_states when sls file missing
|
5 éve |
|
Gareth J. Greenaway
|
1d4e228f15
Updating various skips for tests to only skip if OS is OS X and Python is Python2.
|
5 éve |
|
Gareth J. Greenaway
|
c02db20cb1
Disabling integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag
|
5 éve |
|
Gareth J. Greenaway
|
434dcdaae1
Disabling two tests when using Python 3 and OS X
|
5 éve |
|
Shane Lee
|
d0a6d88797
Merge branch '2018.3' into fixes_test_pip_state_sls_files
|
5 éve |
|
Wayne Werner
|
7ab295c826
Use RUNTIME_VARS for bin/true and bin/false paths
|
5 éve |
|
Gareth J. Greenaway
|
ddf8fc7ad9
Disabling two tests when using Python 3 and OS X
|
5 éve |
|
Ch3LL
|
87cf385e64
increase timeout on test_state for windows
|
5 éve |
|
Ch3LL
|
3442202bb4
Increase timeout for test_kwarg tests
|
5 éve |
|
Ch3LL
|
c70772c5a0
Fix linux state tests- add new comment
|
5 éve |
|
Erik Johnson
|
40100e59fc
Replace "pchanges" with "changes" to fix onchanges/prereq requisites
|
6 éve |
