Nicole Thomas
53e2e05766
Merge branch '2017.7' into fix_win_service
2018-08-31 13:40:37 -04:00
Daniel Wallace
0d7180a70e
Revert "Allow for not being prompted to supply a password to deploy keys to a…"
2018-08-30 16:22:29 -05:00
Nicole Thomas
cf3d2878f2
Merge branch '2017.7' into fix_win_service
2018-08-30 08:58:32 -04:00
Nicole Thomas
7a166bc58a
Merge pull request #49376 from twangboy/fix_48608
...
Fix issue with duplicates in user.list_users on OSX
2018-08-30 08:57:54 -04:00
Nicole Thomas
03d97507f6
Merge pull request #49434 from dwoz/cleanup_exception_handling
...
Clean up exception handling on py3
2018-08-30 08:56:23 -04:00
Daniel Wallace
7099164fa8
Merge pull request #49389 from gtmanfred/2017.7
...
make file envs compatible with fileclient formats
2018-08-29 18:49:23 -05:00
twangboy
bf32e0ca1d
Merge branch 'fix_48608' of https://github.com/twangboy/salt into fix_48608
2018-08-29 16:41:58 -06:00
twangboy
535d83e39e
Fix test for list_users
2018-08-29 16:39:10 -06:00
Daniel A. Wozniak
9daa992c6e
Fix group remove test logic
2018-08-29 15:22:41 -07:00
Mike Place
24faa5e5ec
Merge pull request #49408 from terminalmage/issue49269
...
Allow our custom yaml dumper to NamespacedDictWrapper objects
2018-08-29 15:20:04 -06:00
Erik Johnson
d02ec34790
Allow our custom yaml dumper to NamespacedDictWrapper objects
...
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.
This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
2018-08-29 14:43:10 -05:00
Nicole Thomas
5746fc80c2
Merge pull request #49402 from rallytime/bp-49321
...
Back-port #49321 to 2017.7
2018-08-29 14:13:22 -04:00
rallytime
7dec9fca0c
Add flaky decorator to serializer test
...
Fixes https://github.com/saltstack/salt-jenkins/issues/1093
2018-08-29 11:43:11 -04:00
Daniel A Wozniak
b332bebb20
Fix archive tests for py3
2018-08-29 00:35:17 -07:00
Daniel Wallace
be7c041d75
add test
2018-08-28 21:14:05 -05:00
Daniel A. Wozniak
f9d7dbdb26
The autoruns module has not been renamed
2018-08-28 14:22:05 -07:00
Daniel A. Wozniak
56ea4eebcd
Account for more tests that are not in 2017.7
...
I also made sure there are no other missing tests since this bit me once
already.
2018-08-28 12:13:52 -07:00
twangboy
1641851175
Fix the name of the _cmd_quote test
2018-08-28 11:16:29 -06:00
twangboy
97567af232
Skip tests on Linux systems
2018-08-28 11:03:34 -06:00
twangboy
38009660e4
Add tests
2018-08-28 11:03:33 -06:00
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
