85829 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	144c68e214	Allow non admin name based runs on windows	2018-04-19 00:18:17 -07: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	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	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
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
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
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
Daniel Wallace	1b1c29bf62	add __cli for master processes	2018-04-17 15:00:43 -05: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
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
kstreee	0624aee0ed	Fixes misusing of the timeout option.	2018-04-17 14:21:15 +09:00
Daniel Wozniak	6a4c0b8a1a	Merge pull request #47108 from dwoz/async_test_fix ... Fix unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription	2018-04-16 17:25:06 -07:00
Daniel A. Wozniak	3d85e30ce5	AsyncTestCase is required for AsyncEventPublisher ... Other tests that use AsyncTestCase's io_loop will break if AsyncTestCase is not subclassed when a test instantiates AsyncEventPublisher.	2018-04-16 14:18:08 -07:00
Mike Place	03892eaf0b	Merge pull request #47068 from cachedout/catch_value_error_socket_test ... Catch an operation on a closed socket in a test	2018-04-16 13:56:02 -06:00
Erik Johnson	fed5041c5f	Make error more specific to aid in troubleshooting	2018-04-16 12:55:57 -05:00
Erik Johnson	8c67ab53b4	Fix path in log message ... The actual error refers to the parent dir of the master/minion/etc. pki subdir (i.e. /etc/salt/pki instead of /etc/salt/pki/minion). Therefore, the startswith check needs to look for the parent of the pki_dir.	2018-04-16 12:48:06 -05:00
Erik Johnson	3198ca8b19	Make error more explicit when PKI dir not present for salt-call	2018-04-16 12:44:41 -05:00
François PICOT	149f846f34	fix normalize parameter in pkg.installed	2018-04-16 19:03:20 +02:00
Shane Lee	1ea2885ec2	Merge pull request #47065 from dwoz/jinja_test_fix ... Jinja test fix	2018-04-16 10:16:41 -06:00
Shane Lee	673cd31c65	Merge branch '2017.7' into jinja_test_fix	2018-04-16 10:15:27 -06:00
Daniel Wallace	5293b5b5ca	Merge pull request #47077 from dwoz/test_state_fix ... Fix failing state test by normalizing line endings	2018-04-16 10:48:38 -05:00
Daniel Wallace	ca967de5da	Merge pull request #47067 from gtmanfred/2017.7 ... use the recommended opennebula lookup method	2018-04-16 10:48:14 -05:00
Daniel A. Wozniak	444da3f893	Fix py3 wart (chr vs bytesstring)	2018-04-14 17:39:29 -07:00
Daniel A. Wozniak	46fa2c04de	Fix py3 os.linesep wart	2018-04-14 17:09:50 -07:00
Daniel A Wozniak	e8acca01c2	Fix failing state test by normalizing line endings ... Fixes: integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source	2018-04-14 15:45:11 -07:00
Daniel Wozniak	7fddad6cd9	Merge pull request #47064 from dwoz/roots_tests_fix ... Fix fileserver roots tests	2018-04-14 14:30:22 -07:00
Mike Place	977c6939c4	Merge pull request #47069 from cachedout/match_timeout_arg ... Pass the timeout variable to the CLI when calling salt in tests	2018-04-14 09:20:25 -06:00
Daniel Wallace	2c4c19c622	Merge pull request #47074 from dwoz/ignore_artifacts ... Kitchn should ignore artifacts directory	2018-04-14 08:06:18 -05:00
Daniel A. Wozniak	c3941efad0	Kitchn should ignore artifacts directory	2018-04-14 00:42:04 -07:00
Mike Place	b8990f5258	Pass the timeout variable to the CLI when calling salt in tests	2018-04-13 16:37:01 -06:00
Nicole Thomas	c484c0bd71	Merge pull request #47055 from bloomberg/GH-47000 ... #47000 - add proper handling of full_return in cmd_subset	2018-04-13 16:17:09 -04:00
Daniel A. Wozniak	3c565d7e54	Use salt.utils.fopen	2018-04-13 13:14:19 -07:00
Mike Place	7db5625632	Catch an operation on a closed socket in a test ... This failure wouldn't be related to the test in question so it should be safe to ignore.	2018-04-13 13:54:18 -06:00
Daniel Wallace	f913a7859c	use the recommended opennebula lookup method	2018-04-13 14:45:18 -05:00
Daniel A. Wozniak	25fd7c0694	fix py3 wart, encode os.linesep	2018-04-13 12:33:23 -07:00
Nicole Thomas	f3496030cc	Merge pull request #47039 from twangboy/win_fix_winrm_script ... Fix winrm powershell script	2018-04-13 14:09:55 -04:00
Daniel A. Wozniak	aa965310f1	Clean up cruft	2018-04-13 10:27:17 -07:00
Daniel A Wozniak	efc9866580	Jinja test fixes	2018-04-13 10:23:34 -07:00
Daniel A Wozniak	d79f1a1961	Fix fileserver roots tests	2018-04-13 10:15:13 -07:00
Matt Phillips	8af3f5b874	GH-47000: add proper handling of full_return in cmd_subset ... as noted in the original issue, full_return wasnt being handled properly. This rectifies that.	2018-04-13 10:58:03 -04:00
Nicole Thomas	1700a10ebe	Merge pull request #46326 from kstreee/fix-client-local ... Fixes a timing bug of saltnado's client local.	2018-04-13 09:59:27 -04:00
twangboy	6635b9003f	Fix winrm powershell script ... Removes the `Hostname` paramater in the winrm create command. It is not needed. It must match the hostname on the certificate, which is not defined in the case of the Remote Desktop certificate Removes extra spaces	2018-04-12 14:41:19 -06:00