diff options
| author | Clark Laughlin <clark.laughlin@linaro.org> | 2015-08-27 15:27:49 -0400 |
|---|---|---|
| committer | Clark Laughlin <clark.laughlin@linaro.org> | 2015-08-27 15:27:49 -0400 |
| commit | 7519a720bebcf3e547ab55f9953eb872fd184691 (patch) | |
| tree | 6c47b773f19bdef118ac81f1f00394839bc7ab52 | |
| parent | 1e8080e11e8d1fec6a1d4d256483f38f5d0ba4a6 (diff) | |
tempest pull: fix for ignore patterns
| -rw-r--r-- | tempest-pull/app/bundle.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tempest-pull/app/bundle.py b/tempest-pull/app/bundle.py index 0f86f56..c4aad44 100644 --- a/tempest-pull/app/bundle.py +++ b/tempest-pull/app/bundle.py @@ -224,7 +224,7 @@ class Bundle(object): disabled_services_list_copy.append("volume service") # build up the pattern to check for tests that are skipped due to a service not being enabled - reasons_string = "not available|support is required|does not support|does not check|not available|feature is disabled|feature disabled|is not supported|is not enabled" + reasons_string = "is not available|not available|support is required|does not support|does not check|not available|feature is disabled|feature disabled|is not supported|is not enabled" disabled_service_check_pattern = ".*(" + "|".join(disabled_services_list_copy) + ") (" + reasons_string + ").*" neutron_check_pattern = None @@ -236,12 +236,17 @@ class Bundle(object): # regular expression pattern to check for tests that are skipped or disabled due to a bug bug_disabled_test_pattern = ".*(Bug|tests are disabled).*" + # other patterns that indicate a skip that can be ignored + other_ignore_pattern = ".*(feature is disabled|not available|is not supported).*" + for test in self.all_skipped_tests: ignore_test = False if disabled_service_check_pattern and re.match(disabled_service_check_pattern, test["reason"], re.IGNORECASE): ignore_test = True elif re.match(bug_disabled_test_pattern, test["reason"], re.IGNORECASE): ignore_test = True + elif re.match(other_ignore_pattern, test["reason"], re.IGNORECASE): + ignore_test = True elif neutron_check_pattern and re.match(neutron_check_pattern, test["reason"], re.IGNORECASE): ignore_test = True if ignore_test: |