Commit Graph

95398 Commits

Author SHA1 Message Date
Erik Johnson
a4fc1087a3
Fix docs configuration for renamed logstash engine 2018-11-13 19:04:46 -06:00
Erik Johnson
5b064646f7
Set docs jenkins job to treat warnings as errors 2018-11-13 15:01:10 -06:00
Erik Johnson
9b6c6697ea
Update docs references for states with func_alias 2018-11-13 15:01:10 -06:00
Erik Johnson
62b5d400b6
Disable custom sphinx automodule
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
2018-11-13 14:51:12 -06: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
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
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
rallytime
f578392eb4
Lint Fix: add mock_open import 2018-11-13 09:30:02 -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
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
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
Daniel Wozniak
e5f97cdce0
Merge pull request #50467 from dwoz/test_kitchen_up
Use patched version of test-kitchen until next upstream release
2018-11-12 10:12:14 -07:00
Nicole Thomas
b16ff9cd1c
Merge pull request #50469 from dwoz/minion_timeout_test
Fix up integration.minion.test_timeout
2018-11-12 11:53:45 -05:00
Nicole Thomas
45b438e668
Merge pull request #50470 from dwoz/set_time_flaky
Reset date and time after changing
2018-11-12 11:52:48 -05:00
Nicole Thomas
3aaad17c91
Merge pull request #50468 from garethgreenaway/50461_fix_elementary_os_family_grain
[2018.3] Adding elementary override to grains/core.py
2018-11-12 11:41:56 -05:00
Erik Johnson
6143408507
Add unit test for TimedProc regression 2018-11-12 09:08:49 -06:00
Daniel A. Wozniak
794ba17c94
Reset date and time after changing 2018-11-12 00:43:22 -07:00
Daniel A. Wozniak
57f702dc58
Fix linter warning 2018-11-11 21:49:20 -07:00
Daniel A. Wozniak
686153a77c
Fix up integration.minion.test_timeout
This test wasn't able to be run on it's own. Fix it and add more
debugging
2018-11-11 21:30:08 -07:00
Gareth J. Greenaway
77e8dcc91f
On later versions of elementary, the os_family is being populated as elementary. In order for the aptpkg module to function, we need to override is to be Debian. 2018-11-11 14:50:44 -08:00
Daniel A. Wozniak
8c5e93eaa4 Use patched version of test-kitchen until next release 2018-11-11 15:05:54 -07:00
Erik Johnson
e234abd9e0
Add support for list of commands in git states' onlyif/unless 2018-11-09 13:42:02 -06:00
Brett Benassi
fb614827bd
adding git 2018-11-09 11:55:28 -07:00