85902 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	93d1445ec1	add io_loop handling to runtests engine	2018-04-27 18:51:51 -05:00
twangboy	22ac81df63	Fix integration.modules.test_pip ... Removes references to `no_chown`. It hasn't been in use since 2015.8 Removes usage of user in pip calls. The user is defined as the current user which is the default anyway and it's causing tests not to run in Windows because Windows requires a password Removes the pwd import since it is no longer needed	2018-04-27 15:15:34 -06:00
Nicole Thomas	57c75ff660	Merge pull request #47369 from terminalmage/ldap_pillar ... Return an empty dict if no search_order in ldap ext_pillar config file	2018-04-27 16:58:51 -04:00
Gareth J. Greenaway	d299cf3385	Merge branch '2017.7' into 2017.7-fix-retcode-on-schedule-utils	2018-04-27 13:35:33 -07:00
rallytime	a43485b49c	Fix "of pass" typo in grains.delval docs: change to "or pass" ... Fixes #47264 This also fixes the syntax highlighting since rst needs double backticks rather than single backticks.	2018-04-27 15:44:26 -04:00
Daniel Wallace	bcc66dd9bf	Merge pull request #47363 from DSRCorporation/bugs/replace_exc_info_with_exception ... Tornado5.0: Future.exc_info is dropped	2018-04-27 13:30:17 -05:00
Erik Johnson	085883ae2d	Return an empty dict if no search_order in ldap ext_pillar config file ... I forgot to do this in https://github.com/saltstack/salt/pull/47334, it is needed to prevent a `KeyError` in these cases.	2018-04-27 13:11:59 -05:00
Nicole Thomas	bcef34f7e1	Merge pull request #47334 from terminalmage/ldap_pillar ... pillar_ldap: Fix cryptic errors when config file fails to load	2018-04-27 13:53:51 -04:00
Nicole Thomas	31db8ca7ad	Merge pull request #47347 from dwoz/test_mysql_fix_again ... Proper fix for mysql tests	2018-04-27 13:27:52 -04:00
Shane Lee	57d98224d4	Merge pull request #9 from terminalmage/twangboy/fix_47024 ... Lint and test fixes	2018-04-27 11:01:24 -06:00
Nicole Thomas	e573236848	Merge pull request #47359 from gtmanfred/2017.7 ... add mention of the formulas channel to the formulas docs	2018-04-27 12:56:12 -04:00
Daniel A. Wozniak	add78fb618	Fix linter warnings	2018-04-27 09:04:01 -07:00
Erik Johnson	0175a8687c	pillar_ldap: Fix cryptic errors when config file fails to load ... This fixes an UnboundLocalError when the jinja templating or yaml loading fails. It also re-adds some previously-deleted crucial documentation regarding the `search_order` option. Finally, it fixes some incorrectly-formatted RST and makes the result a example python data structure. We still need "split mode" documentation, but this was left undone with a TODO telling the user to reference a docstring that isn't visible in the docs.	2018-04-27 10:56:02 -05:00
Dmitry Kuzmenko	3f7b93a23c	Tornado5.0: Future.exc_info is dropped	2018-04-27 18:19:36 +03:00
Erik Johnson	37a13d8004	Update pip unit tests to reflect changes	2018-04-27 09:47:18 -05:00
Erik Johnson	7f86779be0	Lint fix	2018-04-27 09:18:53 -05:00
Daniel Wallace	6214ed8133	add mention of the formulas channel to the formulas docs	2018-04-27 08:45:10 -05:00
Nicole Thomas	629503b2a8	Merge pull request #47317 from dwoz/threadshutdown ... Do not join a thread that is stopped	2018-04-27 09:15:08 -04:00
Nicole Thomas	aacd5cefe3	Merge pull request #47304 from cachedout/test_cli_timeout_arg ... Pass timeout to salt CLI for tests	2018-04-27 09:11:57 -04:00
Nicole Thomas	55534fb659	Merge pull request #47311 from Ch3LL/firewall_windows ... Add firewall execution modules tests for windows	2018-04-27 09:10:53 -04:00
Daniel Wallace	1667375a80	Merge pull request #47348 from dwoz/no_symlinks ... Ignore gitfs tests when symlinks not enabled	2018-04-27 08:08:27 -05:00
Daniel A. Wozniak	2644cc7553	Fix linter nits	2018-04-27 01:22:39 -07:00
Daniel A. Wozniak	799c601184	Proper fix for mysql tests	2018-04-27 00:22:50 -07:00
Daniel A. Wozniak	6db2a0e4d3	Log exceptions at exception level	2018-04-27 00:16:39 -07:00
Daniel A. Wozniak	94a70e847a	Ignore gitfs tests when symlinks not enabled	2018-04-26 23:51:28 -07:00
Erik Johnson	c48d8f4f61	DRY and other fixes in pip module ... This makes the following adjustments: - DRY fix for repeated search paths - Checks that python bin found in virtualenv is executable - Removes string-escape encoding, it doesn't have any use if we're not dealing with quotes/special characters - Removes redundant islink check, since a symlink will return True when it points to a file and not a directory, and we know thanks to the prior if block that the path is not a directory so it can only be a file. - `pip` is almost never referred to in upper case, log messages changed to reflect this. - Make context caching of pip version specific to bin_env	2018-04-26 22:37:16 -06:00
twangboy	b1117896a0	Change from global variable to __context__``	2018-04-26 22:37:15 -06:00
twangboy	3e6e524eca	Fix some tests``	2018-04-26 22:37:15 -06:00
twangboy	c94f0f20e4	Fix lint error	2018-04-26 22:32:43 -06:00
twangboy	fd47b21530	Fix merge conflict	2018-04-26 22:32:38 -06:00
Daniel Wozniak	dac04261b5	Merge pull request #47342 from dwoz/test_mysql_fix ... Fix mysql test cases	2018-04-26 17:50:52 -07:00
Daniel Wozniak	34e78ef564	Merge pull request #47341 from dwoz/inet_pton_fix ... Fix python 3 support for inet_pton function	2018-04-26 16:35:44 -07:00
Daniel A. Wozniak	7496f4c5a8	Fix mysql test cases	2018-04-26 15:42:46 -07:00
Daniel Wozniak	e4779f3246	Merge pull request #47339 from dwoz/ssh_key_test_fix ... Use salt.utils.fopen for line ending consistancy	2018-04-26 15:39:55 -07:00
Ch3LL	d58be06751	Add additionatl service module integration tests and enable for windows	2018-04-26 18:13:20 -04:00
Daniel Wozniak	b221860151	Merge pull request #47335 from dwoz/pip_test_fix ... Remove un-needed string-escape	2018-04-26 14:49:26 -07:00
Daniel A. Wozniak	85451f48d4	Fix python 3 support for inet_pton function	2018-04-26 14:03:54 -07:00
Daniel A. Wozniak	e37a93a1ca	Remove redundent close call	2018-04-26 13:47:11 -07:00
Daniel Wozniak	1c527bfd3a	Merge pull request #47331 from dwoz/py3_wingroup_fix ... Do not encode usernames	2018-04-26 12:57:27 -07:00
Daniel A. Wozniak	b2ae5889b7	Close the temporary file handle	2018-04-26 12:52:08 -07:00
Daniel A. Wozniak	9f7f83a975	Use salt.utils.fopen for line ending consistancy	2018-04-26 12:43:51 -07:00
Daniel A. Wozniak	dcb6a22c00	Remove un-needed string-escape	2018-04-26 11:28:25 -07:00
Erik Johnson	65c3ba7ff1	Remove useless documentation ... The private funcs aren't parsed by RST autosummary so telling someone to view them is not helpful	2018-04-26 12:01:22 -05:00
Erik Johnson	5d67cb27de	Remove unncessary commented line	2018-04-26 12:00:40 -05:00
Daniel A. Wozniak	cc154ef857	Do not encode usernames	2018-04-26 09:53:56 -07:00
Mike Place	708078b152	Merge pull request #47329 from cachedout/frank_credit ... Credit Frank Spierings	2018-04-26 11:37:58 -05:00
Mike Place	33c0644ac4	Credit Frank Spierings	2018-04-26 11:29:51 -05:00
Nicole Thomas	a545e55543	Merge pull request #47281 from Ch3LL/system_test ... Add win_system integration module tests	2018-04-26 12:07:40 -04:00
Nicole Thomas	b64d930df0	Merge pull request #47283 from Ch3LL/ntp_test ... Add windows ntp integration module tests	2018-04-26 12:04:43 -04:00
Nicole Thomas	910aff910f	Merge pull request #47314 from Ch3LL/net_mac_test ... Skip netstat test on macosx as its not supported	2018-04-26 12:00:36 -04:00