valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #49710 from rallytime/merge-2018.3

Browse Source 
[2018.3] Merge forward from 2017.7 to 2018.3
This commit is contained in:
Nicole Thomas 2018-09-19 14:05:49 -04:00 committed by GitHub
commit 936cae5017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/runtests.py
View File

@ -11,6 +11,7 @@ import os
import sys
import time
import warnings
import collections
TESTS_DIR = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
if os.name == 'nt':
@ -97,7 +98,7 @@ MAX_OPEN_FILES = {
# Combine info from command line options and test suite directories. A test
# suite is a python package of test modules relative to the tests directory.
TEST_SUITES = {
TEST_SUITES_UNORDERED = {
'unit':
{'display_name': 'Unit',
'path': 'unit'},
@ -181,6 +182,9 @@ TEST_SUITES = {
'path': 'integration/scheduler'},
}
TEST_SUITES = collections.OrderedDict(sorted(TEST_SUITES_UNORDERED.items(),
key=lambda x: x[0]))
class SaltTestsuiteParser(SaltCoverageTestingParser):
support_docker_execution = True

6
tests/unit/modules/test_state.py
View File

@ -787,8 +787,6 @@ class StateTestCase(TestCase, LoaderModuleMockMixin):
'''
Test to clear out the state execution request without executing it
'''
mock = MagicMock(return_value=True)
with patch.object(os.path, 'join', mock):
mock = MagicMock(return_value=True)
with patch.object(salt.payload, 'Serial', mock):
mock = MagicMock(side_effect=[False, True, True])
@ -807,9 +805,7 @@ class StateTestCase(TestCase, LoaderModuleMockMixin):
'''
Test to return the state request information
'''
mock = MagicMock(return_value=True)
with patch.object(os.path, 'join', mock), \
patch('salt.modules.state.salt.payload', MockSerial):
with patch('salt.modules.state.salt.payload', MockSerial):
mock = MagicMock(side_effect=[True, True, False])
with patch.object(os.path, 'isfile', mock):
with patch('salt.utils.files.fopen', mock_open()):