Commit Graph

94231 Commits

Author SHA1 Message Date
Daniel Wallace
2d7f8460bc
Merge pull request #49265 from terminalmage/fix-failing-file-tests
Fix failing unit file module unit tests
2018-08-22 14:35:07 -05:00
Erik Johnson
6b51f71e40
Fix failing unit file module unit tests
This just looks to have been incorrectly handled in a merge-forward.
2018-08-22 14:22:44 -05:00
Daniel Wallace
879c3ad7b7
Merge pull request #49262 from bloomberg/short-circuit
extend #48588 to cover SyncAuth class
2018-08-22 14:04:08 -05:00
Daniel Wallace
15857c2c54
fix diskusage 2018-08-22 14:00:26 -05:00
Daniel Wallace
1900aff4d3
Merge pull request #49144 from twangboy/fix_48163
Add timeout parameter to win_service functions
2018-08-22 13:58:13 -05:00
Erik Johnson
bf5d907ce4
Revert default value for ipv6 to None 2018-08-22 13:29:31 -05:00
Jacob Weinstock
25608ef119
Merge branch '2018.3' into fix-typeerror-unicode 2018-08-22 12:24:31 -06:00
Jacob Weinstock
11ad11c53a
add unicode_literals back to handle logging and other things. 2018-08-22 12:22:08 -06:00
Daniel Wozniak
4634752b7e
Merge pull request #49240 from dwoz/state_tests
file state test fixes
2018-08-22 11:16:41 -07:00
Daniel A. Wozniak
b533fa179a
Simplify by using to_unicode helper 2018-08-22 10:01:39 -07:00
Matt Phillips
a3594db10f extend #488588 to cover SyncAuth class
the original fix was only covered asyncauth, but the syncauth method overrode
the fix. This patch duplicates it so behavior should be consistent in both
codepaths.
2018-08-22 12:54:00 -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
Mike Place
55ded9f03d
Merge pull request #49260 from gtmanfred/flaky-2018.3
[2018.3] flaky tests
2018-08-22 10:40:38 -06:00
Daniel Wallace
41973ff6c0
flaky tests are flaky yo 2018-08-22 11:38:48 -05:00
Daniel Wallace
c927f1bc2b
mark orchestration state tests as flaky 2018-08-22 11:38:40 -05: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
Mike Place
62cc0dffd6
Merge pull request #49231 from minusf/mount-check-name
Check for mandatory parameters for `mount.mounted`
2018-08-22 09:26:03 -06:00
Daniel Wallace
6e776cae94
skip ID 7 for vmware hard drives 2018-08-22 10:25:44 -05:00
Mike Place
d55d484174
Merge pull request #49242 from dwoz/blockreplace_better_fix
Blockreplace better fix
2018-08-22 09:21:29 -06:00
Mike Place
6d023cab6e
Merge pull request #49245 from dwoz/skip_grep_windows
Skip grep unit tests on windows
2018-08-22 09:18:07 -06:00
Mike Place
75beedeb24
Merge pull request #49243 from dwoz/fileserver_tests
Revert newline translation change
2018-08-22 09:12:25 -06:00
Daniel Wallace
bc0b4ac513
Merge pull request #49241 from terminalmage/salt-jenkins-1078
Don't silently catch SystemExit
2018-08-22 07:57:57 -05:00
Daniel Wallace
85f6d36f0e
Merge pull request #49236 from terminalmage/issue32737
Allow compound matching in eauth config expressions
2018-08-22 07:57:02 -05:00
Daniel A. Wozniak
5a0cda51ed
Older GitPython version do not have a close method 2018-08-22 03:27:48 -07:00
Daniel Wozniak
0fb9ccf60a
Merge pull request #49239 from Ch3LL/win_yaml_test
Use yaml's safe_dump in windows ec2 tests
2018-08-22 01:48:12 -07:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode 2018-08-22 01:05:53 -07:00
Daniel A. Wozniak
e30589194e
Skip grep unit tests on windows
These tests are specific to unix like platforms that have grep
installed. On windows we use the win_file module.
2018-08-22 00:08:12 -07:00
Daniel A. Wozniak
74527158ec
Fix up fileserver.test_gitfs tests on windows 2018-08-21 23:45:59 -07:00
Daniel A. Wozniak
800aa254c6
Remove unicode filenames on windows python 2
Need to provide unicode to shutil in order to retrieve and delete
unicode.
2018-08-21 23:45:56 -07:00
Daniel A. Wozniak
1679a19732
Work around listdir encoding issues on py2 windows 2018-08-21 21:53:12 -07:00
Daniel A. Wozniak
86e3c46959
Revert newline translation change
On windows, newlines will be CRLF since we added unix2dos to kitchen.
2018-08-21 20:43:41 -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
Erik Johnson
08d144f2c7
Don't silently catch SystemExit
In `integration.shell.test_syndic.SyndicTest.test_issue_7754`, we use
`run_script` to start up a syndic and make sure that it starts with
specific logging configuration. `run_script` is configured to timeout
after 5 seconds, at which time the process is killed via SIGTERM. Our
signal handler then raises a `SystemExit` to kill the Python process.
However, if this `SystemExit` is raised while `_connect_syndic()` is
attempting to connect to the master-of-masters, it gets swallowed and
the Python process never exits, causing the test suite to hang
indefinitely (until test-kitchen kills it).

This commit ensures we re-raise a `SystemExit` if it is caught during
this connection attempt.
2018-08-21 16:25:30 -05:00
Erik Johnson
c0fdb818f7
Don't use a bare except!
Every time you use a bare except, Cthulu kills a kitten. Please, think
of the kittens.
2018-08-21 16:24:31 -05:00
Daniel A. Wozniak
07ed84197d
file state test fixes
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
2018-08-21 14:10:41 -07:00
Ch3LL
f5b42dbb24
import salt.utils.yaml 2018-08-21 16:28:06 -04:00
Ch3LL
67290eaff7
Use yaml's safe_dump in windows ec2 tests 2018-08-21 16:15:27 -04:00
Erik Johnson
233bbae62f
Allow compound matching in eauth config expressions
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
2018-08-21 14:54:39 -05:00
Mike Place
60605f0248
Merge pull request #48545 from bbinet/fix-unreacheable-ssh-id-wrapper
Fix unreachable ssh-id-wrapper template when root_dir is relative
2018-08-21 09:12:00 -06:00
Frantisek Holop
eb5cab35ca fix some underhanging indent while here... 2018-08-21 16:09:29 +02:00
Frantisek Holop
ec2a091376 check for mandatory parameters to avoid false positives 2018-08-21 16:08:10 +02:00
Bruno Binet
284dcf7c03 Fix unreachable ssh-id-wrapper template when root_dir is relative
Since the git commands will be executed from the user home directory, if
salt root_dir is set to a relative path (for example using
`root_dir: ./.tmp/` in salt config), then the git/ssh-id-wrapper
template may be unreachable and we may encouter the following error that
this patch is fixing:

```
[ERROR   ] Command '[u'git', u'ls-remote', u'git@github.com:bbinet/salt-formula-linux.git']' failed with return code: 128
[ERROR   ] stderr: error: cannot run .tmp/thin/py2/salt/templates/git/ssh-id-wrapper: No such file or directory
fatal: unable to fork
[ERROR   ] retcode: 128
[ERROR   ] Failed to check remote refs: Unable to authenticate using identity file:

error: cannot run .tmp/thin/py2/salt/templates/git/ssh-id-wrapper: No such file or directory
fatal: unable to fork
```
2018-08-21 09:28:49 +02:00
Jacob Weinstock
6944bafb45
add salt.utils.stringutils.to_bytes. add comment on unicode_literals. 2018-08-20 18:33:16 -06:00
twangboy
ff5ec86252
Work with seconds 2018-08-20 17:36:55 -06:00
Daniel Wallace
a4c51a9e18
Merge pull request #49209 from gtmanfred/lsattr
don't blow up check_perms if lsattr file doesn't exist
2018-08-20 14:02:42 -05:00
Daniel Wallace
5ba7f60f03
Merge pull request #49187 from erwindon/py27fixnumberformat
Fix for #45620: "Salt CLI is rounding floats to 2 decimal places"
2018-08-20 13:59:09 -05:00
Daniel Wallace
d29af008da
Merge pull request #49190 from The-Loeki/redis-fix
decode_reponses=True on all Redis API interfaces
2018-08-20 13:57:25 -05:00