Daniel A. Wozniak
aeb0fa3bfd
custom_grains tests do not exist
2018-08-27 21:30:01 -07:00
Daniel Wozniak
14b8094909
Merge pull request #49346 from Ch3LL/bp-49345
...
[2017.7] Backport #49345
2018-08-27 18:54:31 -07:00
Daniel Wozniak
d8f2945813
Merge pull request #49344 from cachedout/test_matcher_flaky
...
Matcher test marked flaky
2018-08-27 18:50:35 -07:00
Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests
2018-08-27 16:30:10 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart
2018-08-27 14:36:40 -07:00
Daniel Wallace
ce2733ef9a
upgrade including linux kernels
...
This is required for ubuntu 14.04 to pass.
2018-08-27 15:07:56 -04:00
Mike Place
a34ef2e54d
Matcher test marked flaky
2018-08-27 10:56:55 -06:00
Daniel Wallace
00b58ee438
Merge pull request #49337 from dwoz/win_service_test_fix
...
Fix broken service stop test
2018-08-27 09:22:37 -05:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3
2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
ac60fb8190
Comment strange code
2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes
2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
1765d53367
Fix archive tests on Windows platform
2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
06f271ff19
Add archive module tests to whitelist.txt
2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
9cb8fe28c5
Add more tests to whitelist for windows
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
bc971e419e
add doc tests
2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
8899a5ee1a
Add more client tests to whitelist
2018-08-27 00:44:37 -07:00
Daniel A. Wozniak
14cd7b4830
Add cli tests to whitelist
2018-08-27 00:44:37 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7
2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands
2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars
...
Remove set command prefix on windows since it can not be run inline with
other commands.
2018-08-27 00:44:35 -07:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test
2018-08-26 18:34:47 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits
2018-08-26 17:03:16 -07:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts
...
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
2018-08-24 10:46:50 -07:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions
2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings
2018-08-24 09:35:00 -07:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it
2018-08-23 13:08:04 -04:00
Mike Place
395bae6486
Merge pull request #49259 from gtmanfred/flaky-2017.7
...
[2017.7] flaky tests
2018-08-22 10:40:53 -06:00
Daniel Wallace
93a576ef63
flaky tests are flaky yo
2018-08-22 11:38:23 -05:00
Daniel Wallace
f518bd3efc
mark orchestration state tests as flaky
2018-08-22 11:37:43 -05:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode
2018-08-22 01:05:53 -07:00
Daniel A Wozniak
1bf0b18224
Better blockfix replace
2018-08-21 16:15:11 -07:00
Daniel A Wozniak
dd4fcd3445
Revert "Multiple block replace test fixes"
...
This reverts commit 94ac2b4fc7
2018-08-21 16:15:10 -07:00
twangboy
d3358423ae
Use os.linesep.join instead of textwrap.dedent
2018-08-21 16:15:07 -07:00
Mike Place
0157eacffc
Merge pull request #49164 from terminalmage/issue49154
...
Fix bug in keep_source for non-templated salt:// file sources
2018-08-18 08:11:57 -04:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test
2018-08-17 14:07:19 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests
2018-08-17 13:17:08 -07:00
Mike Place
7043286d6c
Merge pull request #49143 from Ch3LL/bp-49142
...
[2017.7] Backport #49142
2018-08-17 16:40:39 +02:00
Mike Place
c2aba7abde
Merge branch '2017.7' into issue49154
2018-08-17 16:14:08 +02:00
Daniel A. Wozniak
b5ba073d65
Simplify dict keys lookup
2018-08-16 23:33:52 -07:00
Daniel A. Wozniak
6844251315
Fix remaining file state integration tests (py3)
2018-08-16 19:57:39 -07:00
Erik Johnson
b4544d7f89
Add keep_source integration tests
2018-08-16 14:53:32 -05:00
Daniel A. Wozniak
3384864e8f
add Exception type
2018-08-16 11:57:28 -07:00
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails
2018-08-16 10:48:19 -07:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests
2018-08-15 17:35:23 -04:00
Daniel A. Wozniak
c6b781eea5
Multiple fixes for integration.states.test_file
...
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
2018-08-14 11:43:21 -07:00
Daniel A. Wozniak
054afb8197
Multiple file state test fixes
...
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
2018-08-13 12:29:25 -07:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
...
No conflicts.
2018-08-10 09:08:47 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent.
2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test
2018-08-09 17:33:56 -04:00
