Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Preserve already defined DESTRUCTIVE_TESTS and EXPENSIVE_TESTS env variables #55151

Merged
merged 4 commits into from
Dec 3, 2019
Merged

[master] Preserve already defined DESTRUCTIVE_TESTS and EXPENSIVE_TESTS env variables #55151

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8c0cfa
Preserve already defined DESTRUCTIVE_TESTS and EXPENSIVE_TESTS env va…
meaksh Jun 3, 2019
9538508
Merge branch 'master' into master-bp-53343
dwoz Nov 5, 2019
9edc9f8
Merge branch 'master' into master-bp-53343
dwoz Nov 13, 2019
6377f47
Merge branch 'master' into master-bp-53343
dwoz Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/support/parser/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,12 +598,12 @@ def _validate_options(self):

self.validate_options()

if self.support_destructive_tests_selection:
if self.support_destructive_tests_selection and not os.environ.get('DESTRUCTIVE_TESTS', None):
# Set the required environment variable in order to know if
# destructive tests should be executed or not.
os.environ['DESTRUCTIVE_TESTS'] = str(self.options.run_destructive)

if self.support_expensive_tests_selection:
if self.support_expensive_tests_selection and not os.environ.get('EXPENSIVE_TESTS', None):
# Set the required environment variable in order to know if
# expensive tests should be executed or not.
os.environ['EXPENSIVE_TESTS'] = str(self.options.run_expensive)
Expand Down