Merge branch '2017.7' into vbox-skd-fix

This commit is contained in:
Chris Smith 2018-04-20 18:01:57 -05:00 committed by GitHub
commit 5de53139cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -175,7 +175,7 @@ class SaltCoverageTestingParser(SaltTestingParser):
# Update environ so that any subprocess started on tests are also
# included in the report
coverage_options['data_suffix'] = True
os.environ['COVERAGE_PROCESS_START'] = '1'
os.environ['COVERAGE_PROCESS_START'] = ''
os.environ['COVERAGE_OPTIONS'] = json.dumps(coverage_options)
# Setup coverage