valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,109 Commits 24 Branches 182 Tags 341 MiB
41a2586fc0
Commit Graph

94109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel A. Wozniak
942b68bfc8
Fix remaining file state integration tests (py3) 2018-08-30 10:39:05 -04:00
Daniel A. Wozniak
22ed452479
Work around listdir encoding issues on py2 windows 2018-08-30 10:27:45 -04:00
Daniel A. Wozniak
f5be275835
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-30 10:27:45 -04:00
Daniel Wallace
0191af1423
flaky tests are flaky yo 2018-08-30 10:18:13 -04:00
Daniel Wallace
720b671dda
mark orchestration state tests as flaky 2018-08-30 10:18:12 -04:00
Nicole Thomas
af80e64569
Merge pull request #49368 from rallytime/bp-49322 
Back-port #49322 to 2018.3.3
 2018-08-28 13:15:14 -04:00
Nicole Thomas
0fee3e8786
Merge pull request #49363 from rallytime/bp-49245 
Back-port #49245 to 2018.3.3
 2018-08-28 13:14:17 -04:00
Nicole Thomas
dbcd2fc726
Merge pull request #49361 from rallytime/bp-49244 
Back-port  #49244 to 2018.3.3
 2018-08-28 13:12:57 -04:00
Nicole Thomas
b4a1e1d365
Merge pull request #49362 from rallytime/bp-49240 
Back-port #49240 to 2018.3.3
 2018-08-28 13:00:25 -04:00
rallytime
cc606509d0
Fix is_windows call - use the right path 2018-08-28 12:58:11 -04:00
Nicole Thomas
9ca9a775ff
Merge pull request #49365 from rallytime/bp-49270 
Back-port #49270 to 2018.3.3
 2018-08-28 12:56:22 -04:00
Nicole Thomas
bbff57da16
Merge pull request #49364 from rallytime/bp-49243 
Back-port #49243 to 2018.3.3
 2018-08-28 12:55:54 -04:00
Daniel A. Wozniak
238853b9ec
Encode shell commands explicitly. 
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
 2018-08-28 10:26:26 -04:00
Daniel A. Wozniak
1b3f37a8b8
Add async helper to test_sock_path_len 
This test function is causing another test:

unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription

To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
 2018-08-28 09:30:47 -04:00
Daniel A. Wozniak
5db77c6229
Revert newline translation change 
On windows, newlines will be CRLF since we added unix2dos to kitchen.
 2018-08-28 09:28:58 -04:00
Daniel A. Wozniak
5488fbea38
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-28 09:26:35 -04:00
Daniel A. Wozniak
16ca5b9694
Work around listdir encoding issues on py2 windows 2018-08-28 09:24:16 -04:00
Daniel A. Wozniak
7650208dbc
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-28 09:24:16 -04:00
Daniel A. Wozniak
e0909d3a25
Simplify by using to_unicode helper 2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
4723c69092
Older GitPython version do not have a close method 2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
d5fecba716
Fix up fileserver.test_gitfs tests on windows 2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
4b688f6347
Remove unicode filenames on windows python 2 
Need to provide unicode to shutil in order to retrieve and delete
unicode.
 2018-08-28 09:22:19 -04:00
Daniel Wozniak
74b78835b3
Merge pull request #49347 from Ch3LL/bp_49345_2018.3.3 
[2018.3.3] Backport #49345
 2018-08-27 18:53:59 -07:00
Daniel Wallace
7bf5ba83c8
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:11:13 -04:00
Daniel Wallace
be6691d91b
Merge pull request #49323 from Ch3LL/skip_git 
Skip nonexistent branch test for git versions <1.7.10
 2018-08-25 14:52:47 -05:00
Ch3LL
ee3d32f74e
Skip nonexistent branch for git versions <1.7.10 2018-08-24 18:11:32 -04:00
Nicole Thomas
64d7b0e4c6
Merge pull request #49313 from rallytime/bp-49236 
Back-port #49236 to 2018.3.3
 2018-08-24 16:59:15 -04:00
Nicole Thomas
7a89a4c8aa
Merge pull request #49311 from rallytime/bp-49303 
Back-port #49303 to 2018.3.3
 2018-08-24 13:48:23 -04:00
rallytime
1a5ef996e3
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 13:00:43 -04:00
Erik Johnson
549f5d5a86
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-24 12:59:55 -04:00
Daniel Wallace
3fe1387751
use os._exit instead of sys.exit when daemonizing 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
 2018-08-24 10:29:52 -04:00
Nicole Thomas
7bb356f11e
Merge pull request #49294 from Ch3LL/fed_28_tests 
Move run_function call from __init__ to setup
 2018-08-24 08:41:34 -04:00
Nicole Thomas
a607f9332f
Merge pull request #49302 from twangboy/fix_installer_2018.3.3 
Fix installer 2018.3.3
 2018-08-24 08:41:14 -04:00
twangboy
68fd37575e
Fix erroneous NSSM reference 2018-08-23 17:28:56 -06:00
twangboy
103f2c289e
Remove delete vcredist line 2018-08-23 17:24:38 -06:00
twangboy
007a16638e
Bring installer updates from 2017.7.8 to 2018.3.3 2018-08-23 17:13:53 -06:00
Ch3LL
0a5d44a3db
Move run_function call from __init__ to setup 2018-08-23 15:34:27 -04: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 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
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
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
Mike Place
134f125b96
Merge pull request #49182 from terminalmage/salt-jenkins-1078 
Fix hanging syndic test
 2018-08-18 08:10:31 -04:00
Erik Johnson
a2d2cd317b
Fix hanging syndic test 
There was no `syndic_master` and the fallback DNS lookup failed. This
caused a traceback which hung the test suite.
 2018-08-17 17:30:22 -05:00
Daniel Wozniak
b3a247bfbb
Merge pull request #49172 from Ch3LL/bp-49118 
[2018.3.3] cherry pick #49118
 2018-08-17 13:54:04 -07:00
Daniel Wozniak
85ffc8db87
Merge pull request #49173 from Ch3LL/bp-49167 
[2018.3.3] cherry pick #49167
 2018-08-17 13:30:26 -07:00
Daniel Wozniak
ee54ea5f73
Merge pull request #49171 from Ch3LL/bp-49103 
[2018.3.3] cherry pick #49103
 2018-08-17 13:23:31 -07:00
Daniel A. Wozniak
a1a298a13c
Simplify dict keys lookup 2018-08-17 11:45:07 -04:00
Daniel A. Wozniak
3d26affa10
Fix remaining file state integration tests (py3) 2018-08-17 11:45:07 -04:00