jenkins-bot merged this change.
[tests] Skip scripts which are in _allowed_failure list
Bug: T223030
Change-Id: I90724c76f54fa4812bd94291cfd92116cd4e589e
---
M tests/script_tests.py
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/script_tests.py b/tests/script_tests.py
index e265965..593c73c 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -15,7 +15,7 @@
from tests import join_root_path, unittest_print
from tests.aspects import (unittest, DefaultSiteTestCase, MetaTestCaseClass,
PwbTestCase)
-from tests.utils import allowed_failure, execute_pwb, add_metaclass
+from tests.utils import execute_pwb, add_metaclass
scripts_path = join_root_path('scripts')
@@ -341,7 +341,9 @@
if script_name in dct['_expected_failures']:
dct[test_name] = unittest.expectedFailure(dct[test_name])
elif script_name in dct['_allowed_failures']:
- dct[test_name] = allowed_failure(dct[test_name])
+ dct[test_name] = unittest.skip(
+ '{} is in _allowed_failures list'
+ .format(script_name))(dct[test_name])
# Disable test by default in nosetests
if script_name in unrunnable_script_set:
To view, visit change 509631. To unsubscribe, or for help writing mail filters, visit settings.