Enhance the compatibility judgement of INSTALLER 85/45285/1
authorLinda Wang <wangwulin@huawei.com>
Mon, 16 Oct 2017 02:34:03 +0000 (02:34 +0000)
committerCedric Ollivier <cedric.ollivier@orange.com>
Tue, 17 Oct 2017 04:52:59 +0000 (04:52 +0000)
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)

functest/ci/tier_handler.py

index dd3e77c..cbabe63 100644 (file)
@@ -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: