94039 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ch3LL	ce5e17bdbd	update is_windows salt.utils to correct path	2018-08-17 11:40:50 -04:00
Daniel A. Wozniak	3fef112409	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-17 11:36:40 -04:00
Daniel A Wozniak	05a2b91fb2	Install the launcher so we can execute py files	2018-08-17 11:25:32 -04:00
Mike Place	58034c9dc3	Merge pull request #49132 from Ch3LL/bp-49062 ... [2018.3.3] backport PR #49062	2018-08-17 16:51:49 +02:00
Gareth J. Greenaway	01f8f83cf0	Merge pull request #49142 from Ch3LL/rm_z_arg ... Remove -Z script_arg for cloud tests	2018-08-16 09:12:58 -07:00
Ch3LL	a1ef6a88a6	Remove -Z script_arg for cloud tests	2018-08-15 17:27:02 -04:00
Daniel Wallace	a03828884b	Merge pull request #49137 from Ch3LL/bootstrap_2018.3.3 ... [2018.3.3] Update bootstrap script to latest release (2018.08.15)	2018-08-15 14:49:21 -05:00
Ch3LL	eb9a612096	[2018.3.3] Update bootstrap script to latest release (2018.08.15)	2018-08-15 15:31:22 -04:00
Wesley Whetstone	990fdb6a52	decorator link fix, updating context names, as well as updating macutils tests for latest changes	2018-08-15 11:43:20 -04:00
Wesley Whetstone	3ab5d282be	fixing an issue with memoize on macOS services, switching to useing __context__ instead	2018-08-15 11:43:14 -04:00
Nicole Thomas	b412bff534	Merge pull request #49110 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-14 13:11:24 -04:00
Mike Place	e78fc0e0eb	Merge pull request #48901 from garethgreenaway/48665_auth_ldap_valid_token_failed_auth ... [2018.3] fix to auth/ldap.py	2018-08-14 18:10:18 +02:00
rallytime	4649f60209	Update old utils paths with new paths	2018-08-14 09:52:40 -04:00
rallytime	49c2a784bb	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/file.py - salt/modules/reg.py - salt/states/reg.py - tests/integration/states/test_file.py	2018-08-14 09:48:13 -04:00
Nicole Thomas	d46e23f4c2	Merge pull request #49109 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-08-14 09:10:46 -04:00
rallytime	3c5527f300	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-08-14 09:09:42 -04:00
Nicole Thomas	484c1e0123	Merge pull request #49099 from rallytime/bp-49085 ... Back-port #49085 to 2018.3	2018-08-14 08:42:50 -04:00
Daniel Wozniak	8954dd269f	Merge pull request #49090 from dwoz/file_line_fix ... Search for (but do not include) CRLF line ending	2018-08-13 15:00:33 -07:00
Daniel Wozniak	b99edc3dce	Merge pull request #49088 from dwoz/file_hash_diffs ... Multiple file state test fixes	2018-08-13 14:59:28 -07:00
Daniel Wozniak	274977b6c4	Merge pull request #49087 from dwoz/url_file_test_fixes ... Filter out scheme's that are not valid	2018-08-13 14:58:58 -07:00