91935 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Murphy	3f30ab2ed6	ZFS backport of 46933 to 2018.3.1	2018-04-19 12:08:58 -06:00
Daniel Wozniak	1a600bb9a4	Merge pull request #47172 from dwoz/cover_without_admin ... Allow non admin name based runs on windows	2018-04-19 10:26:41 -07:00
twangboy	345daa0423	Add additional integration tests to whitelist	2018-04-19 10:52:14 -06:00
rallytime	878fa06134	Test fix: remove tornado testing lib from class ... This use in the test class causing a failure in this branch that doesn't occur in the 2017.7 branch. This tornado lib is also not necessary for this particular test class. This might cause a failure in the windows tests, but I have already spoken to @dwoz about this and he is going to address this in a separate PR if needed.	2018-04-19 12:04:58 -04:00
Ch3LL	25a84428b8	Add status module integration modules tests for Windows	2018-04-19 12:01:40 -04:00
Daniel A. Wozniak	cadd759727	Use warnings to warn user	2018-04-19 08:26:50 -07:00
Nicole Thomas	2ee8006da3	Merge pull request #47165 from terminalmage/issue47081 ... Make sure a str type is passed to os.walk	2018-04-19 10:59:15 -04:00
Nicole Thomas	6257862bbb	Merge pull request #47070 from terminalmage/with_tempdir ... Use decorators for temp files/dirs in test suite	2018-04-19 10:01:47 -04:00
Daniel A. Wozniak	144c68e214	Allow non admin name based runs on windows	2018-04-19 00:18:17 -07:00
Erik Johnson	048728d2b7	Remove unused imports	2018-04-18 19:46:32 -05:00
Erik Johnson	879c557264	Use decorators for temp files/dirs in test suite ... This adds a new decorator which creates a temporary directory and cleans it after the test completes. It also modifies an existing decorator for creating temporary files so that it accepts arguments, which will be passed through to salt.utils.files.mkstemp().	2018-04-18 19:46:29 -05:00
Erik Johnson	9e29acb477	Make sure a str type is passed to os.walk ... With strings internally being unicode types in 2018.3.0, we end up passing a unicode path to os.walk. Python 2 appears to have a bug in the stdlib in some versions, in which posixpath can't handle unicode types. This commit ensures that we pass a str type to os.walk in our os.walk helper.	2018-04-18 15:54:07 -05:00
Nicole Thomas	b46365614b	Merge pull request #47155 from mcalmer/fix-patchinstall ... Fix patchinstall for yumpkg	2018-04-18 15:24:16 -04:00
rallytime	0039395017	Updage jenkins module autodocs to use jenkinsmod name instead ... Refs #46801 The jenkins module was renamed to jenkinsmod recently, but the autodoc files were never updated. We need to remove the jenkins.py docs from the docbuild server, but we can't do that if the new docs for jenkinsmod.py aren't building yet. This PR updates the autodoc files to point to the new file.	2018-04-18 15:14:30 -04:00
Nicole Thomas	13ae1a2413	Merge pull request #47061 from terminalmage/issue47042 ... Fix diffing binary files in file.get_diff	2018-04-18 14:52:09 -04:00
Erik Johnson	d185f97a47	mocked file_roots and pillar_roots should be dicts	2018-04-18 13:20:07 -05:00
Nicole Thomas	d5997d2301	Merge pull request #47110 from kstreee/fix-misusing-of-timeout ... Fixes misusing of the timeout option.	2018-04-18 13:16:19 -04:00
Nicole Thomas	cba0f13cd9	Merge pull request #47058 from terminalmage/lsattr ... Fix calls to file.lsattr when lsattr is not installed	2018-04-18 12:30:11 -04:00
Nicole Thomas	b96ce23b3f	Merge pull request #47104 from terminalmage/issue46929 ... yamlloader: Properly handle colons in inline dicts	2018-04-18 12:22:46 -04:00
Nicole Thomas	c12697b173	Merge pull request #47076 from terminalmage/issue46859 ... pillar_ldap: Load config options as str types	2018-04-18 12:16:22 -04:00
Nicole Thomas	87ca2b4003	Merge pull request #40961 from terminalmage/issue40948 ... Make error more explicit when PKI dir not present for salt-call	2018-04-18 12:08:16 -04:00
Daniel Wallace	50bd885ec7	Merge pull request #47107 from twangboy/fix_46932 ... Fix issues with reg state, add tests	2018-04-18 10:53:01 -05:00
Michael Calmer	382afba457	fix invalid string compare	2018-04-18 17:37:05 +02:00
Michael Calmer	8c19368938	provide kwargs to pkg_resource.parse_targets required to detect advisory type	2018-04-18 17:19:18 +02:00
Erik Johnson	87f6cefea3	Rewrite flaky utf8 state to make it easier to troubleshoot	2018-04-18 10:14:19 -05:00
Erik Johnson	df6e535f05	Fix diffing binary files in file.get_diff	2018-04-18 10:14:19 -05:00
Nicole Thomas	f5e63584d4	Merge pull request #47134 from Ch3LL/user_win_test ... Add user integration tests for windows OS	2018-04-18 10:29:39 -04:00
Nicole Thomas	d6c59696be	Merge pull request #47041 from terminalmage/issue46909 ... Force null bytes to be str types	2018-04-18 10:08:24 -04:00
Erik Johnson	6ba66cca41	Fix incorrect logic in exception check	2018-04-17 16:51:26 -05:00
Nicole Thomas	da2f6a3fac	Merge pull request #47131 from gtmanfred/cli ... add __cli opts variable for master processes	2018-04-17 17:33:56 -04:00
Nicole Thomas	9a9f6524f8	Merge pull request #47007 from twangboy/fix_46968 ... Fix some issues with the win_servermanager module	2018-04-17 16:57:04 -04:00
Ch3LL	e7c9bc4038	Add user integration tests for windows OS	2018-04-17 16:45:41 -04:00
Nicole Thomas	9b8e6ffb8c	Merge pull request #47129 from rallytime/bp-47121 ... Back-port #47121 to 2017.7	2018-04-17 16:45:10 -04:00
Nicole Thomas	eb5ac51a48	Merge pull request #47102 from gtmanfred/2017.7 ... dont allow using no_use_wheel for pip 10.0.0 or newer	2018-04-17 16:44:57 -04:00
Erik Johnson	c06c859caf	pillar_ldap: Load config options as str types ... Also make the same str type enforcement apply to all calls to _config() in ldapmod.py.	2018-04-17 15:37:18 -05:00
Erik Johnson	e4182715be	Special check specifically for bytes types	2018-04-17 15:34:17 -05:00
rallytime	a40f007962	lint: get_context is in stringutils.py now	2018-04-17 16:29:48 -04:00
Erik Johnson	eeb067e910	Fix calls to file.lsattr when lsattr is not installed ... This was partially fixed before 2018.3.0, but some careless programming since then has caused problems to return. This fixes those by making `file.lsattr` return `None` when lsattr is not installed, and then fixes all references to take this into account.	2018-04-17 15:19:15 -05:00
Daniel Wallace	1b1c29bf62	add __cli for master processes	2018-04-17 15:00:43 -05:00
twangboy	ae8ab2ab1a	Fix tests for py3, enable tearDown	2018-04-17 13:59:12 -06:00
Jeff.JF Lin	11da526b21	add ImportError	2018-04-17 15:07:47 -04:00
Jeff.JF Lin	bd0c23396c	fix pip.req import error in pip 10.0.0	2018-04-17 15:07:47 -04:00
Daniel Wallace	c1dc42e67e	Merge pull request #47037 from twangboy/fix_dev_scripts ... Fix build_env scripts	2018-04-17 13:54:16 -05:00
Daniel Wallace	3dc93b310b	fix tests	2018-04-17 13:18:18 -05:00
rallytime	3416e398c6	Update old utils paths references to use new paths	2018-04-17 11:02:38 -04:00
rallytime	94c2a12be6	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/modules/test_state.py - tests/unit/templates/test_jinja.py - tests/unit/test_minion.py	2018-04-17 10:54:42 -04:00
Daniel Wallace	8497e08f8e	fix pip module for 10.0.0 ... Fixes #46971	2018-04-17 09:23:03 -05:00
Daniel Wallace	4c07a3d1e9	fix other tests	2018-04-17 09:23:03 -05:00
Daniel Wallace	b71e3d8a04	dont allow using no_use_wheel for pip 10.0.0 or newer ... The --no-use-wheel flag has been deprecated in pip 10.0.0	2018-04-17 09:23:02 -05:00
Nicole Thomas	a52137ee36	Merge pull request #47109 from garethgreenaway/46943_slack_engine_fixes ... [2018.3] fixes to Slack engine	2018-04-17 09:56:26 -04:00