Merge branch '2017.7' into bugs/tornado50

This commit is contained in:
Dmitry Kuzmenko 2018-04-23 14:16:48 +03:00
commit 39e403b18d
No known key found for this signature in database
GPG key ID: 4C7CAD30C95651DA

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