95414 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bornwitbugs	e59ced6507	Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix	2018-11-14 17:54:37 +00:00
Nicole Thomas	a50377be29	Merge pull request #50509 from Ch3LL/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-14 12:52:05 -05:00
Ch3LL	178dab3a4b	Merge branch 2017.7 into 2018.3 ... Conflicts: - doc/topics/tutorials/salt_bootstrap.rst - tests/integration/cloud/clouds/test_digitalocean.py	2018-11-14 10:33:44 -05:00
Nicole Thomas	55b4914644	Merge pull request #50502 from twangboy/lgpo_2018.3 ... Add definition for RestrictRemoteSAM	2018-11-14 09:30:37 -05:00
twangboy	fe92a3a506	Add definition for RestrictRemoteSAM	2018-11-13 13:14:58 -07:00
Mike Place	c1dde7e9b1	Merge pull request #50328 from rallytime/fix-48734 ... Fix issue with salt-run jobs.list_jobs where Target: unknown-target	2018-11-13 12:49:57 -07:00
Daniel Wozniak	351faeb952	Merge pull request #50499 from dwoz/build_fix ... Fix 2018.3 build	2018-11-13 11:46:54 -07:00
Daniel A. Wozniak	5754b4a7c6	Fix 2018.3 build	2018-11-13 11:33:26 -07:00
Mike Place	6f4b23f689	Merge pull request #50496 from terminalmage/2018.3-docs ... Fix 2018.3 docs build warnings	2018-11-13 10:21:08 -07:00
Nicole Thomas	c00fd43ee9	Merge pull request #50493 from rallytime/bp-50362 ... Back-port #50362 to 2017.7	2018-11-13 11:59:50 -05:00
Nicole Thomas	6b272c1d65	Merge pull request #50492 from rallytime/bp-50228-and-50443 ... Back-port #50228 and #50443 to 2018.3	2018-11-13 11:59:14 -05:00
Nicole Thomas	3cac1d0de7	Merge pull request #50494 from terminalmage/2017.7-docs ... Late import to fix docs build errors	2018-11-13 11:29:22 -05:00
rallytime	7879a2d791	Fix logging format	2018-11-13 11:27:57 -05:00
Erik Johnson	cb256418a9	Fix header underline length to avoid another sphinx warning	2018-11-13 10:18:47 -06:00
Erik Johnson	9272f7b735	Fix more sphinx build errors	2018-11-13 09:56:42 -06:00
Erik Johnson	18a8104aae	Late import to fix docs build errors	2018-11-13 08:48:43 -06:00
Erik Johnson	d4571328ed	Fix sphinx build warnings in 2018.3 branch ... The async renaming for Python 3.7 needed to be reproduced here as well.	2018-11-13 08:47:12 -06:00
Erik Johnson	d561b26f10	Late import to fix docs build errors	2018-11-13 08:45:10 -06:00
rallytime	f578392eb4	Lint Fix: add mock_open import	2018-11-13 09:30:02 -05:00
twangboy	60559cfa8a	Remove flaky test	2018-11-13 09:25:47 -05:00
twangboy	a696a8f564	Fix test_matcher on Windows ... Fixes a timeout issue in test_salt_documentation_arguments_not_assumed	2018-11-13 09:25:41 -05:00
Wesley Whetstone	e5b999ba99	add try/except when checking for service Label	2018-11-13 09:22:58 -05:00
Shea Craig	3c36bddd8a	Fix linting errors.	2018-11-13 09:22:24 -05:00
Shea Craig	fab57de795	Write tests to handle invalid launchd plist XML.	2018-11-13 09:21:58 -05:00
Shea Craig	bb429b0dff	Condense service result assertions, add a binary plist test.	2018-11-13 09:21:58 -05:00
Shea Craig	a809fef417	Factor out another helper function, implement broken symlink test.	2018-11-13 09:21:58 -05:00
Shea Craig	216f7ef864	Update testing for mac_utils services. ... This commit begins to go over the existing testing for mac_utils, applying the updated best-practices from the unit testing section of the Salt docs. Wherever possible, I've tried to keep the data for each test within the test, while factoring out repetitive functions. In this commit, for example, the `os.walk` side_effect func has been factored into its own helper function. This commit begins looking at what is being tested for this module and making it more specific, specifically to test one thing per test (existing tests had multiple asserts and in some casaes were actually malformed such that the tests would pass, but in actual use, code would throw an exception and skip over the block).	2018-11-13 09:21:57 -05:00
Shea Craig	89d826738f	Fix trailing-slash bug in User LaunchAgent appending. ... I discovered this issue while updating the tests, so there's no open issue for it.	2018-11-13 09:13:37 -05:00
Shea Craig	0e23b6e7f1	Handle bad plists by ignoring them, with py2 and py3 specific approaches	2018-11-13 09:13:07 -05:00
Shea Craig	fa4414949b	Avoid AttributeError when checking for exception types.	2018-11-13 09:11:19 -05:00
Shea Craig	fd62b336dc	Add secondary exception handler for malformed plists.	2018-11-13 09:11:19 -05:00
Shea Craig	ae6f49b0b1	Make test correctly generate a double exception.	2018-11-13 09:11:18 -05:00
Daniel Wozniak	da980d9bdb	Merge pull request #50486 from twangboy/lgpo_2018.3 ... Back port lgpo from Fluorine	2018-11-13 02:40:16 -07:00
Daniel Wozniak	7dd34386ef	Merge pull request #50456 from terminalmage/issue50218 ... Two bugfixes	2018-11-12 23:06:51 -07:00
twangboy	bbbc07b65f	Back port lgpo from Fluorine	2018-11-12 16:59:08 -07:00
Nicole Thomas	d8514e6b7e	Merge pull request #50455 from dubb-b/2018.3 ... Adding the released version as the bootstrap minion.	2018-11-12 17:52:52 -05:00
Nicole Thomas	08299447af	Merge pull request #50479 from Ch3LL/digital_ocean_location ... Update digital ocean location for cloud tests	2018-11-12 17:50:42 -05:00
Nicole Thomas	917781dc95	Lint: Add blank line	2018-11-12 17:47:46 -05:00
Nicole Thomas	accf681f08	Merge pull request #50480 from terminalmage/docs ... Don't import obsolete Directive class from Sphinx	2018-11-12 17:46:18 -05:00
Nicole Thomas	cfb33511df	Merge pull request #50483 from rallytime/bp-50272 ... Back-port #50272 to 2018.3	2018-11-12 17:45:05 -05:00
Nicole Thomas	2e9b3d2a02	Merge pull request #50478 from rallytime/update-bootstrap-docs ... Update the bootstrap script documentation to point to bootstrap repo	2018-11-12 17:44:43 -05:00
Nicole Thomas	360ae6a955	Merge pull request #50481 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-12 17:44:14 -05:00
Erik Johnson	0f02da7fec	Remove unnecessary u prefix from string literals ... These are redundant with unicode_literals being used	2018-11-12 16:45:28 -05:00
Erik Johnson	fc26ae8ea3	Add unit test for comparing containers with the same env vars	2018-11-12 16:45:22 -05:00
Joanna Yurdal	cf7cb4beeb	extra blank line after function definition(pylint)	2018-11-12 16:45:14 -05:00
Joanna Yurdal	1de9ce382d	Compare sorted docker environment	2018-11-12 16:45:08 -05:00
rallytime	1517bb31a8	Update old utils paths to use new paths	2018-11-12 16:13:35 -05:00
rallytime	d8e7c47a05	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/support/case.py	2018-11-12 16:11:17 -05:00
Erik Johnson	c34690e509	Don't import obsolete Directive class from Sphinx ... Directive was apparently removed from Sphinx and made part of docutils. For some reason, in this saltdomain extension, we were importing both from docutils and sphinx. This worked well enough while Directive was still only deprecated, but it appears to recently have been removed, meaning that it now just causes an ImportError. This commit removes the redundant import.	2018-11-12 14:54:38 -06:00
Ch3LL	3583519da4	Update digital ocean location for cloud tests	2018-11-12 15:52:32 -05:00