saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2019.2.1' into ssh_tops

Browse source
This commit is contained in:
Megan Wilhite 2019-05-14 11:40:53 -04:00 • committed by GitHub
commit cbbc76425a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/files/file/base/_modules/runtests_helpers.py
View file

@ -172,5 +172,5 @@ def get_python_executable():
python_binary = None
except AttributeError:
# We're not running inside a virtualenv
python_binary = None
python_binary = sys.executable
return python_binary

1
tests/runtests.py
View file

@ -195,7 +195,6 @@ TEST_SUITES = collections.OrderedDict(sorted(TEST_SUITES_UNORDERED.items(),
class SaltTestsuiteParser(SaltCoverageTestingParser):
support_docker_execution = True
support_destructive_tests_selection = True
support_expensive_tests_selection = True
source_code_basedir = SALT_ROOT
def _get_suites(self, include_unit=False, include_cloud_provider=False,