Merge pull request #55151 from meaksh/master-bp-53343

[master] Preserve already defined DESTRUCTIVE_TESTS and EXPENSIVE_TESTS env variables
saltstack · Dec 3, 2019 · 5d61324 · 5d61324
2 parents a77b1b3 + 6377f47
commit 5d61324
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/support/parser/__init__.py b/tests/support/parser/__init__.py
@@ -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)