89766 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	033f34ee21	Fix failing boto/network tests ... These failures were recently introduced but went undiscovered due to some recent instability in the test suite (which has now been fixed). This commit fixes these failing tests.	2018-01-21 17:24:11 -06:00
Nicole Thomas	a5128e8184	Merge pull request #45584 from terminalmage/daemons-test-stability ... Improve robustness of daemons unit tests	2018-01-21 13:08:06 -05:00
Erik Johnson	2926834423	Improve robustness of daemons unit tests ... https://github.com/saltstack/salt/pull/45583 was opened to fix some test failures in the daemons tests. However, with the way that the tests were written, `_multiproc_exec_test` was waiting for a response from the child function, which would never come due to the error raised during the test. This means that any exception raised during the test would stop the test suite dead in its tracks, causing it to eventually end in a timeout. This commit addresses this design flaw by wrapping the test logic in a try/except, and ensuring that we always return a response from the child function. The tests will instead log the exception and gracefully fail the test, allowing whomever troubleshoots the failures to consult the salt-runtests.log to see the traceback.	2018-01-20 22:49:02 -06:00
Mike Place	ab63da4f35	Merge pull request #45583 from terminalmage/fix-mocked-logger ... Fix mocked logger in daemons tests	2018-01-20 21:14:56 -07:00
Erik Johnson	83acd43294	Fix mocked logger in daemons tests ... This was not caught when the daemons had their logging switched to using string formatting instead of str.format()	2018-01-20 22:09:54 -06:00
Erik Johnson	0caa9091ca	Merge pull request #45575 from terminalmage/fix-log-message ... Fix arg order in log message	2018-01-20 17:17:57 -06:00
Mike Place	2295d4df39	Merge pull request #45579 from terminalmage/test-suite-stability ... Test suite stability fixes	2018-01-20 16:15:47 -07:00
Erik Johnson	34db948300	Restrict pyzmq optimizations to pyzmq >= 14.3.0 ... The optimizations added in 00f31bf cause problems with older ZMQ versions.	2018-01-20 16:44:46 -06:00
Erik Johnson	62117d0021	Fix event unpack	2018-01-20 14:24:22 -06:00
Erik Johnson	dd8599309b	Fix arg order in log message ... When str.format() was removed from this log message in 685bfbb, the order of arguments was not changed, which causes the info log to not make sense. This corrects that oversight.	2018-01-20 13:23:57 -06:00
Nicole Thomas	b33df7dadd	Merge pull request #45480 from terminalmage/str-environ ... aptpkg: force additional environment variables to be str types	2018-01-20 10:31:22 -05:00
Nicole Thomas	4fdb5cb135	Merge pull request #45419 from garethgreenaway/oxygen_updating_utils_for_unicode_round_three ... [oxygen] Oxygen updating utils and related tests for Unicode round three	2018-01-19 16:23:56 -05:00
Erik Johnson	4176f4cbd9	aptpkg: force additional environment variables to be str types ... This prevents tracebacks in subprocess due to unicode values in the dict merged into os.environ via the module's __init__ func.	2018-01-19 15:23:16 -06:00
Nicole Thomas	061c7e3bcb	Merge pull request #45536 from twangboy/win_fix_test_configparser ... Fix `unit.utils.test_configparser` for Windows	2018-01-19 15:14:58 -05:00
Nicole Thomas	4cfc66ad57	Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three	2018-01-19 10:21:37 -05:00
Nicole Thomas	bef1e070aa	Merge pull request #45338 from twangboy/win_fix_test_ansiblegate ... Fix `unit.modules.test_ansiblegate` for Windows	2018-01-19 09:21:38 -05:00
Nicole Thomas	31111ef734	Merge pull request #45534 from twangboy/win_fix_test_crypt ... Fix `unit.test_crypt` for Windows	2018-01-18 17:53:09 -05:00
twangboy	93aec6fbd9	Fix decode issue on Py2, Use os.linesep	2018-01-18 20:45:40 +00:00
twangboy	50859057ed	Skip tests on Windows, gate module on Windows	2018-01-18 13:27:56 -07:00
twangboy	176d3aab62	Revert one more indent	2018-01-18 13:27:56 -07:00
twangboy	38c2ce2fa0	Revert indents	2018-01-18 13:27:55 -07:00
twangboy	f72e7c28f2	Revert imports	2018-01-18 13:27:55 -07:00
twangboy	fbb4e712e7	revert changes to unittest	2018-01-18 13:27:55 -07:00
twangboy	3126af7661	Fix patch indenting, remove :returns:	2018-01-18 13:27:55 -07:00
twangboy	18bc68939c	Fix broken tests, use correct assert functions	2018-01-18 13:27:54 -07:00
twangboy	2dea2f16a9	Remove salt.utils.platform import	2018-01-18 19:13:33 +00:00
twangboy	2859be5d57	Fix mock, fix paths	2018-01-18 19:07:50 +00:00
Nicole Thomas	33e81c7cbf	Merge pull request #45515 from twangboy/win_fix_test_jinja ... Fix `unit.templates.test_jinja` for Windows	2018-01-18 11:01:49 -05:00
Nicole Thomas	8123025a3b	Merge pull request #45512 from terminalmage/py3-b ... [PY3] Update modules/states for PY3/Unicode compatibility (B)	2018-01-18 10:53:58 -05:00
Nicole Thomas	01145c6afd	Merge pull request #45488 from terminalmage/str-env ... [PY2] timed_subprocess: ensure custom env vars do not contain unicode	2018-01-18 10:43:44 -05:00
Nicole Thomas	bd891ee13a	Merge pull request #45405 from garethgreenaway/oxygen_updating_utils_for_unicode_round_one ... [oxygen] Updating various utils and related tests for Unicode goodness.	2018-01-18 10:39:55 -05:00
Nicole Thomas	83e9893b5d	Merge pull request #45426 from terminalmage/py3-salt.utils-p ... [PY3] Add unicode_literals to salt.utils modules (P)	2018-01-18 10:31:08 -05:00
Nicole Thomas	3dc3e4e690	Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix ... Isbm ssdp spurious errors fix	2018-01-18 07:07:01 -05:00
Erik Johnson	7199c0b9db	(PY2 only) Ensure custom args passed to timed_subprocess are encoded	2018-01-17 20:43:48 -06:00
Erik Johnson	abd470f7b1	Handle corner case where None is passed in command args	2018-01-17 20:43:48 -06:00
Erik Johnson	ef44ca977a	[PY2] timed_subprocess: ensure custom env vars do not contain unicode ... subprocess will use `ascii` to encode them which will cause trouble if any actual unicode content is present.	2018-01-17 20:43:48 -06:00
Erik Johnson	e0890baa31	Use correct attribute in test_log_created	2018-01-17 19:54:47 -06:00
Erik Johnson	2ab1e71ef2	[PY3] Add unicode_literals to salt.utils modules (P)	2018-01-17 19:54:44 -06:00
twangboy	4517ca72b9	Ensure utf-8 encoding	2018-01-17 16:22:44 -07:00
Erik Johnson	4ca7931655	[PY3] Update modules/states for PY3/Unicode compatibility (B) ... This includes all the boto modules	2018-01-17 17:06:07 -06:00
Gareth J. Greenaway	f724c579d2	Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_one	2018-01-17 12:51:38 -08:00
Gareth J. Greenaway	a68ff09084	Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three	2018-01-17 12:51:34 -08:00
Bo Maryniuk	371f5b6518	Remove explicit unicode literal	2018-01-17 19:23:24 +01:00
Bo Maryniuk	d62ffb781e	Remove redundant argument from the function	2018-01-17 19:16:52 +01:00
Bo Maryniuk	e2c0164c3b	Remove mistakingly added code after conflict resolution	2018-01-17 19:15:29 +01:00
Nicole Thomas	7d5899469e	Merge pull request #45445 from rallytime/bp-45385 ... Back-port #45385 to oxygen	2018-01-17 12:53:05 -05:00
rallytime	4b64a3964e	Update function new name in release notes	2018-01-17 12:45:12 -05:00
Nicole Thomas	12a899cfb9	Merge pull request #45463 from rallytime/fix-unit-file-test ... Change "to_str" to "to_bytes": needed when opening a file in bytes mode	2018-01-17 12:38:11 -05:00
Nicole Thomas	f65fed754c	Merge pull request #45447 from rallytime/bp-45393 ... Back-port #45393 to oxygen	2018-01-17 12:31:56 -05:00
Gareth J. Greenaway	5309123fb6	Wrap the return in salt.utils.stringutils.to_bytes for PY2 so we are sure we are getting back bytes and not unicode.	2018-01-17 09:03:14 -08:00