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
rallytime
66b078c1ab
Update the bootstrap script documentation to point to bootstrap repo
...
This page is not updated very often and gets missed when various fixes/updates
go into the bootstrap script's repo. Instead of trying to maintain both pages,
the salt doc should have a general description with links to the bootstrap-repo
files.
2018-11-12 15:38:09 -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
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility
2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing
...
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
2018-11-11 00:58:47 -07:00
bornwitbugs
d07c84d7ad
reordering ret dictionary in load test to ascending order
2018-11-11 03:47:12 +00: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
Brett Benassi
181b8a429e
removing stable
2018-11-09 11:53:45 -07:00
Brett Benassi
fc93ad6ebf
Adding the released version as the bootstrap minion.
2018-11-09 11:42:59 -07:00
Nicole Thomas
c85561ee56
Merge pull request #50442 from rallytime/replace-docbanner
...
Update docbanner hyperlink
2018-11-08 17:10:32 -05:00
rallytime
193325d58a
Update docbanner hyperlink
2018-11-08 17:05:13 -05:00
Nicole Thomas
72005688e5
Merge pull request #50439 from rallytime/bootstrap-contributing-docs
...
Add bootstrap section to contributing docs
2018-11-08 16:53:08 -05:00
Nicole Thomas
cca7a365cd
Merge pull request #50441 from rallytime/replace-docbanner
...
Update SaltConf doc banner
2018-11-08 16:52:45 -05:00
rallytime
2af92bd647
Update SaltConf doc banner
2018-11-08 16:42:29 -05:00
rallytime
d2158aa0fa
Add bootstrap section to contributing docs
...
Fixes #34089
2018-11-08 16:03:19 -05:00
twangboy
0d4b799969
Upgrade requests to 2.20.1
2018-11-08 11:10:08 -07:00
twangboy
23f78b0c5c
Upgrade requests to 2.20.1
2018-11-08 11:07:38 -07:00
Mike Place
d9179fb5b2
Merge pull request #50333 from garethgreenaway/50311_pkg_installed_fails_sources_hold
...
[2018.3] Fix to pkg.installed for sources and hold: True
2018-11-08 11:02:32 -07:00
