summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-10-16 02:34:03 +0000
committerCedric Ollivier <cedric.ollivier@orange.com>2017-10-17 04:52:59 +0000
commitf73a27258427b33a261c3e103ec1da25ef5c026b (patch)
treea287cb4be0e2399b93959f176dc07668841e2397
parent07d3e55554b208a4d1626329ad5e1664c97f173c (diff)
Enhance the compatibility judgement of INSTALLER
When the env INSTALLER_TYPE is None, while the var installer in dependencies is not None, the current test case should not be run. Change-Id: If1b67f16f39d5c44b2c3729819dd665faed41b73 Signed-off-by: Linda Wang <wangwulin@huawei.com> (cherry picked from commit 801a53baa1229fd4a88bb1aad692b86f536d970d)
-rw-r--r--functest/ci/tier_handler.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py
index dd3e77ce3..cbabe63bc 100644
--- a/functest/ci/tier_handler.py
+++ b/functest/ci/tier_handler.py
@@ -121,6 +121,9 @@ class TestCase(object):
def is_compatible(self, ci_installer, ci_scenario):
try:
+ if (self.is_none(ci_installer) and not
+ self.is_none(self.dependency.get_installer())):
+ return False
if not self.is_none(ci_installer):
if re.search(self.dependency.get_installer(),
ci_installer) is None: