85823 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shane Lee	f031710af2	Merge branch '2017.7' into fix_47024	2018-05-01 16:26:04 -06:00
twangboy	7c46d9d0d4	Fix integration.modules.test_pip ... Pass password as kwarg for runas on Windows Fix issues with pip 10 in unit.states.test_pip	2018-05-01 15:33:29 -06:00
Nicole Thomas	b0f3fb577f	Merge pull request #47375 from terminalmage/issue47310 ... Warn on use of virtual packages in pkg.installed state	2018-05-01 17:12:18 -04:00
Nicole Thomas	56235032f4	Merge pull request #47415 from kstreee/fix-local-client-tgt-bug ... Fixes a bug of rest_tornado's 'local' client, complement fix of #46326	2018-05-01 17:11:24 -04:00
Nicole Thomas	d65ceaee03	Merge pull request #47286 from baniobloom/vpc_peering_connection_name_fix ... fixed vpc_peering_connection_name option	2018-05-01 15:02:09 -04:00
kstreee@gmail.com	b8d37e0a1e	To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692.	2018-05-02 03:21:06 +09:00
Erik Johnson	fa2bea52bb	Remove extra blank line to appease linter	2018-05-01 13:11:19 -05:00
Erik Johnson	f8ab2be81c	Add debug logging if we fail to detect virtual packages	2018-05-01 13:11:19 -05:00
Erik Johnson	67c4fc56ac	Warn on use of virtual packages in pkg.installed state	2018-05-01 13:11:19 -05:00
kstreee	4627bad1fd	Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload.	2018-05-02 02:20:56 +09:00
Mike Place	a968965087	Merge branch '2017.7' into vpc_peering_connection_name_fix	2018-05-01 11:31:08 -05:00
Nicole Thomas	8a5d4437bb	Merge pull request #47270 from meaksh/2017.7-fix-retcode-on-schedule-utils ... Fix minion scheduler to return 'retcode' from executed functions	2018-04-30 14:21:54 -04:00
Nicole Thomas	5b51075384	Merge pull request #47371 from rallytime/fix-47264 ... Fix "of pass" typo in grains.delval docs: change to "or pass"	2018-04-30 14:18:45 -04:00
Daniel Wallace	a86e53be66	Merge pull request #47389 from dwoz/moregittestfix ... Older GitPython versions will not have close	2018-04-29 11:42:05 -05:00
Daniel A. Wozniak	67745c1362	Older GitPython versions will not have close	2018-04-29 00:50:20 -07:00
Daniel Wozniak	a5367eaf63	Merge pull request #47388 from dwoz/test_pip_fix ... Fix missing import	2018-04-28 11:33:14 -07:00
Daniel A. Wozniak	eb26321e8b	Fix missing import	2018-04-28 10:29:30 -07:00
Daniel Wallace	9b59b991c2	Merge pull request #47380 from gtmanfred/2017.7 ... add io_loop handling to runtests engine	2018-04-28 12:25:28 -05:00
Daniel Wallace	37822c0cbb	Merge pull request #47384 from dwoz/test_pip_fix ... Fix py2 version of pip test	2018-04-28 10:13:28 -05:00
Daniel Wallace	eefd96732e	Merge pull request #47382 from dwoz/gitfs_tests ... Close the repo and fix multiple tests	2018-04-28 10:09:16 -05:00
Daniel A. Wozniak	a37a9da1fb	Fix py2 version of pip test	2018-04-28 02:24:39 -07:00
Daniel A. Wozniak	1570708fac	Close the repo and fix multiple tests	2018-04-28 01:32:02 -07:00
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