89744 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	fe9b35181a	Fix regex statement ... The path seperator in Windows is an escape character in regex	2018-01-19 21:28:01 +00: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	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
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	e14b655c01	More unicode changes. Adding print_function to all files. Updating various reads & writes to files.	2018-01-17 09:02:17 -08:00
Gareth J. Greenaway	db41d9b303	Updating various utils and related tests for unicode goodness.	2018-01-17 09:02:17 -08:00
Nicole Thomas	4803fef51a	Merge pull request #44648 from isbm/isbm-bsc1068446-develop ... DoubleBugfix: a) errors in external pillar causes crash, b) highstate crashes on certain SLS scenarios	2018-01-17 10:58:34 -05:00
Bo Maryniuk	29b67b3b18	Refactor unit tests so they call class-based decorator	2018-01-17 14:13:25 +01:00
Bo Maryniuk	dbe7c01ed6	Update integration test: docs, add more checks, rename	2018-01-16 18:13:00 +01:00
Bo Maryniuk	9356c3ea62	Use output unifier decorator	2018-01-16 18:04:28 +01:00
Bo Maryniuk	88c51fd6f1	Move all separate decorators into a compound decorator	2018-01-16 18:04:15 +01:00
Bo Maryniuk	0bb542f641	Do not use chain decorators	2018-01-16 18:03:56 +01:00
Bo Maryniuk	0baddd675a	Bailout if a state function returns anything but dictionary type	2018-01-16 18:02:33 +01:00
Bo Maryniuk	9df156ed7c	Fix lint for PEP8 spacing	2018-01-16 18:01:54 +01:00
rallytime	9e7aeb5e02	Change "to_str" to "to_bytes": needed when opening a file in bytes mode ... References: https://github.com/saltstack/salt/pull/45357	2018-01-16 10:41:46 -05:00
Bo Maryniuk	d0c54f43cc	Git rebase spaghetti fix	2018-01-15 15:36:06 +01:00
Bo Maryniuk	27667eea40	Fix a broken line	2018-01-15 15:34:46 +01:00
Bo Maryniuk	f0d5dc50f8	Remove unused call, replaced by a decorator	2018-01-15 15:34:46 +01:00
Bo Maryniuk	40a18d1119	Use unicode literals	2018-01-15 15:34:46 +01:00
Bo Maryniuk	f122cc6407	Remove unused variables and reorder comments	2018-01-15 15:34:46 +01:00
Bo Maryniuk	58f1303d48	Remove empty lines	2018-01-15 15:34:46 +01:00