From: Linda Wang <wangwulin@huawei.com>
Date: Mon, 16 Oct 2017 02:34:03 +0000 (+0000)
Subject: Enhance the compatibility judgement of INSTALLER
X-Git-Tag: opnfv-5.0.RC1~10
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F45285%2F1;p=functest.git

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)
---

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: