C. R. Oldham
3c37322e31
Add matchers directory and move default set of matchers to separate .py
2018-09-21 09:35:52 -06:00
C. R. Oldham
0891459395
Refactor matchers to all use similar function signatures.
2018-09-21 09:35:51 -06:00
C. R. Oldham
3c797303be
Split matchers out into separate .py files. Add refresh_matchers, sync_matchers.
2018-09-21 09:35:50 -06:00
C. R. Oldham
910d7f71a3
Remove unused imports
2018-09-21 09:35:50 -06:00
C. R. Oldham
312b0f2d37
Lint
2018-09-21 09:35:49 -06:00
C. R. Oldham
7a93b09668
Clarify setup
2018-09-21 09:35:49 -06:00
C. R. Oldham
140e816f7f
Typo
2018-09-21 09:35:48 -06:00
C. R. Oldham
ae913507dc
Handle this as a classmethod amd be smarter about setting it up.
2018-09-21 09:35:47 -06:00
C. R. Oldham
c73ba1426f
Add some more needed imports
2018-09-21 09:35:46 -06:00
C. R. Oldham
0ae06c079d
Add matchers directory and move default set of matchers to separate .py
2018-09-21 09:35:45 -06:00
C. R. Oldham
497327dd93
Add matchers directory and move default set of matchers to separate .py
2018-09-21 09:35:35 -06:00
matt LLVW
1da9f340dc
Fix test opts in append, prepend states/file.py
...
Fixes #49604
2018-09-21 16:53:46 +02:00
Nicole Thomas
6a3e127dce
Merge pull request #49722 from meaksh/2018.3-fix-zypper-issue-on-python3
...
Fixes some issues on the Zypper module
2018-09-21 09:38:02 -04:00
Nicole Thomas
e7bbb83f45
Merge pull request #49720 from cstarke/2018.3
...
Seperate prlctl and prlsrvctl checks into each requiring function
2018-09-21 09:32:46 -04:00
Nicole Thomas
f745e438b3
Merge pull request #49615 from terminalmage/ping-interval
...
ping_interval: use service.restart instead of signaling
2018-09-21 09:26:40 -04:00
Nicole Thomas
0a530d2f8f
Merge pull request #49731 from terminalmage/jinja-filter-warning
...
Add warning about using jinja filters to dump dicts in Jinja
2018-09-21 09:16:04 -04:00
cstarke
b0be6aa422
Add documentation for prlctl and prlsrvctl binary requirement
2018-09-21 11:41:02 +02:00
cstarke
4f8476b2ad
Fix tests; add test for CommandExecutionError
2018-09-21 11:39:43 +02:00
Erik Johnson
8393560642
Add warning about using jinja filters to dump dicts in Jinja
2018-09-20 14:56:26 -05:00
Nicole Thomas
91acb82537
Merge pull request #49696 from jgleissner/2018.3-azurearm-deps
...
loosen azure sdk dependencies in azurearm cloud driver
2018-09-20 15:17:14 -04:00
Nicole Thomas
4555497583
Merge pull request #49725 from rallytime/fix-jenkins-1122
...
Skip test_local_pkg_install test again for RedHat distros.
2018-09-20 15:08:43 -04:00
Nicole Thomas
d434e3664b
Merge pull request #49684 from twangboy/fix_49675
...
Detect when system needs reboot after domain join
2018-09-20 12:17:49 -04:00
Mike Place
5ef2def2bd
Merge pull request #49703 from twangboy/fix_49675_2017.7
...
Detect when system needs reboot after domain join (2017.7)
2018-09-20 12:04:16 -04:00
Daniel A. Wozniak
536fce611f
Increase function timeout
2018-09-20 09:30:17 -06:00
Nicole Thomas
c1512810ee
Merge pull request #49711 from rallytime/merge-fluorine
...
[fluorine] Merge forward from 2018.3 to fluorine
2018-09-20 11:08:41 -04:00
rallytime
2d8015fb24
Skip test_local_pkg_install test again for RedHat distros.
...
There is a deep bug that I was not able to track down that is causing
a SyntaxError within the test suite.
Until we have time to dedicate more resources to tracking this down,
let's skip it again (recently re-enabled) for the RedHat family.
The test is used to catch an error where the salt-call command was running
twice, so we can rely on the other OSes that don't have this deep bug to
catch regressions.
2018-09-20 10:57:07 -04:00
cstarke
3c96dd2b5e
Fix tests for parallels module
2018-09-20 16:46:22 +02:00
Mike Place
b5726d27be
Merge pull request #49718 from vutny/doc/2017.7/add-missing-mock-kwarg
...
[DOC] Add missing `mock` argument for `state.apply`
2018-09-20 09:22:06 -04:00
Pablo Suárez Hernández
bb9cb6e482
Fix wrong queryformat for zypper list_provides
2018-09-20 11:56:47 +01:00
Pablo Suárez Hernández
d40c034ce1
Fix index error when running on Python 3
2018-09-20 11:51:58 +01:00
cstarke
9034c4e7cf
Add import for CommandExecutionError
2018-09-20 12:45:28 +02:00
cstarke
752b6f8546
Seperate prlctl and prlsrvctl checks into each requiring function
2018-09-20 11:33:53 +02:00
Denys Havrysh
3e19176664
[DOC] Add missing mock argument for state.apply
2018-09-20 12:06:37 +03:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test
2018-09-19 22:47:07 -06:00
Daniel A. Wozniak
5ac3738ea9
Merge remote-tracking branch 'saltstack/2018.3' into whitelist
2018-09-19 19:08:50 -06:00
Daniel A. Wozniak
1f60753a47
Do not use close_fds on Windows OS
2018-09-19 19:07:41 -06:00
Mike Place
912722253c
Merge branch '2017.7' into fix_49675_2017.7
2018-09-19 16:12:45 -04:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine'
...
No conflicts.
2018-09-19 14:07:06 -04:00
Nicole Thomas
936cae5017
Merge pull request #49710 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-09-19 14:05:49 -04:00
Daniel A. Wozniak
4a54c7c164
Fix file serialize test
2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
0ec1e1eca3
Increase timeout on flaky test
2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
6ae924b85f
Skip test that is not applicable on windows
2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
598020079f
Increase timeout on flaky test
2018-09-19 11:21:12 -06:00
Daniel A. Wozniak
1757eddae1
Increase ModuleTest.run_function timeout
...
Reduce flakyness with greater timeout
2018-09-19 11:21:12 -06:00
Daniel A Wozniak
7c7353c5f6
Add more tests to whitelist
2018-09-19 11:21:10 -06:00
Joachim Gleissner
467e017cdb
remove unused import from azurearm driver
2018-09-19 17:27:11 +02:00
rallytime
d19c67f619
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-09-19 09:59:32 -04:00
Nicole Thomas
b082f79fcb
Merge pull request #49708 from rallytime/bp-49555
...
Back-port #49555 to 2018.3
2018-09-19 09:12:11 -04:00
Nicole Thomas
0e97d9e694
Merge pull request #49707 from rallytime/bp-49702
...
Back-port #49702 to 2018.3
2018-09-19 09:09:09 -04:00
Gareth J. Greenaway
6bd85b5946
Merge pull request #49706 from garethgreenaway/1120_remove_mock_os_path_join
...
[2017.7] Removing os.path.join mocking from tests.
2018-09-18 21:09:09 -06:00
