Nicole Thomas
0dcaead36d
Merge pull request #47968 from gtmanfred/2017.7
...
Clean up tox + pytest
2018-06-06 17:23:51 -04:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg
...
Add try/finally, fix typo in 7zip def file
2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service
...
Fix failing test when service doesn't exist
2018-06-06 15:05:42 -04:00
Nicole Thomas
b81d482067
Merge pull request #47983 from garethgreenaway/backport_47843_2017_7
...
[2017.7] Backporting #47843
2018-06-06 15:03:14 -04:00
Daniel Wallace
ae1b0d28bb
pass LANG and HOME into tox commands
2018-06-06 12:23:55 -05:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests
2018-06-06 12:22:22 -05:00
Nicole Thomas
d56ddad22c
Merge pull request #47533 from twangboy/fix_47178
...
Fix issues with functions that use makedirs on Windows
2018-06-06 13:20:50 -04:00
Nicole Thomas
5c56b8c755
Merge pull request #47827 from twangboy/fix_47791
...
Fix issue when archive is on mapped drive
2018-06-06 13:18:00 -04:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file.
2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7.
2018-06-06 09:00:42 -07:00
Nicole Thomas
998a1c13d5
Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-names-assumption
...
Fix postfix.set_main's assumption of prefix-free key names
2018-06-06 11:43:23 -04:00
Daniel Wallace
e1872e2036
simplify tox.ini
2018-06-05 20:41:52 -05:00
Daniel Wallace
81bd01f5af
add tests.txt for running tests with tox requirements
2018-06-05 18:55:04 -05:00
Daniel Wallace
556a2067fc
fix masterapi test to use testing directory for configs
2018-06-05 18:36:27 -05:00
Daniel Wallace
5a41f484ef
add EXPENSIVE_TESTS
2018-06-05 18:36:27 -05:00
Daniel Wallace
055cd5a6ba
set DESTRUCTIVE_TESTS environment variable for pytest
2018-06-05 18:36:27 -05:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file
2018-06-05 13:29:49 -06:00
Nicole Thomas
df50ce7b1b
Merge pull request #47824 from twangboy/fix_setup.py
...
Fix issues with setup.py in Windows
2018-06-05 13:39:52 -04:00
Nicole Thomas
3e91a31134
Merge pull request #47922 from damon-atkins/2017.7_win_pkg_keys_fix
...
win_pkg: pkg.refresh_db verbose=True PY3 compatibility fix
2018-06-05 09:31:48 -04:00
Moritz Bunkus
0ae402d1b5
Fix postfix.set_main's assumption of prefix-free key names
...
Salt's "postfix.set_main" module function used "line.startswith()"
for determining which entries from "main.cf" to keep and which to
overwrite. This matched more lines that intended, though, as the names
of Postfix' configuration options aren't prefix-free.
For example, both "virtual_transport" and
"virtual_transport_rate_delay" are valid and known keys. Therefore
trying to set "virtual_transport" would lead to
"virtual_transport_rate_delay" being replaced, too, by another
instance of "virtual_transport".
The new method matches the line based on the key name being terminated
by whitespace, an equal sign or the end of the line.
Fixes #47888 .
2018-06-05 15:05:51 +02:00
twangboy
0cd47aa81e
Remove unused import
2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist
2018-06-04 18:09:12 -06:00
twangboy
fbbd91f09e
Add more descriptive debug message
2018-06-04 15:41:49 -06:00
twangboy
365f81651b
Fix deprecated exception handling
...
Use 'path is on' to account for instances where the message is 'path is
on mount' vs 'path is on drive', both of which will throw this error.
2018-06-04 15:41:48 -06:00
twangboy
8dd6710b93
Use local instead of network
2018-06-04 15:41:48 -06:00
twangboy
980d99d74b
Fix issue when archive is on mapped drive
2018-06-04 15:41:48 -06:00
Damon Atkins
7129203b1b
Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
2018-06-05 00:45:52 +10:00
Nicole Thomas
8008fca2f6
Merge pull request #47933 from terminalmage/add-pillar.get-docs
...
Clarify pillar.get docs
2018-06-04 10:07:57 -04:00
Nicole Thomas
ab565bfaa3
Merge pull request #47944 from terminalmage/fix-git.detached-docs
...
Replace use of deprecated argument name in git.detached docstring
2018-06-04 09:53:33 -04:00
Erik Johnson
1d082b4389
Replace use of deprecated argument name in git.detached docstring
2018-06-03 00:19:11 -05:00
Damon Atkins
6253793cb6
Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
2018-06-03 11:23:16 +10:00
Erik Johnson
4eb022b675
Clarify pillar.get docs
...
Explicitly state that pillar.get pulls from in-memory pillar data.
2018-06-01 17:06:02 -05:00
twangboy
4538b3abb3
Remove 'len-as-condition' disablement
2018-06-01 11:51:52 -06:00
twangboy
d4efcc3c8b
Skip lint errors
2018-06-01 11:51:08 -06:00
twangboy
1b3977f8d4
Remove m2crypto download for Windows
...
Fix pip issue with pip 10
2018-06-01 11:50:59 -06:00
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs
...
Clean up doc build warnings, add best practices for writing states
2018-06-01 10:42:54 -04:00
Damon Atkins
4ce0fe6546
win_pkg under py3 keys returns a view instead of a list, wrap keys in list()
2018-06-02 00:12:20 +10:00
Daniel Wallace
d2f3377b5b
Merge pull request #47877 from dwoz/sleep_audit
...
Revert job chunk wait time change
2018-06-01 09:11:45 -05:00
Daniel Wallace
735e92093e
Merge pull request #47917 from dwoz/winsuite
...
Fix windows tests suite breakage
2018-06-01 06:42:14 -05:00
Daniel A Wozniak
118601ebd6
Fix windows tests suite breakage
2018-05-31 23:17:18 -07:00
Erik Johnson
8cb33d3dec
Quiet the linter
...
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
2018-05-31 15:28:25 -05:00
Erik Johnson
af51e16f23
Use more elegant RST syntax
2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module
2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking
...
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes
2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes
2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states
2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states
2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
...
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration
2018-05-31 15:28:24 -05:00
