commit 100410044e3891399c3d6b82b191cd2a70ac4a85
author Oleksiy Petrenko <opetrenko@mirantis.com> Wed Feb 06 14:27:26 2019 +0200
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Aug 23 08:25:22 2019 +0000
tree d63ff0fb679f68ca8e94507623aa2ac2330d1cda
parent ab45b4cbb5c9bd7e8ee59f2d731901be3ff4018a

Don't fall when just loading runtest modules

this avoids loading warnings on salt-master that may not have
os-client-config installed, as salt tries to load them irrespective of
__virtual__() result.

Change-Id: I99f9e6c44c0715087a92ec2684ce8a6250429243
Related-Issue: https://mirantis.jira.com/browse/PROD-26920
(cherry picked from commit 63fcb96f7bd4a1f5595b081c4de11e678d85bf32)

_modules/runtest/conditions.py

diff --git a/_modules/runtest/conditions.py b/_modules/runtest/conditions.py
index 05fe24e..5eb4763 100644
--- a/_modules/runtest/conditions.py
+++ b/_modules/runtest/conditions.py
@@ -1,4 +1,9 @@
-import jsonpath_rw as jsonpath
+try:
+    import jsonpath_rw as jsonpath
+except ImportError:
+    jsonpath = None
+from salt import exceptions
+
 import operator
 
 
@@ -19,6 +24,10 @@
 class BaseRule(object):
 
     def __init__(self, field, op, val, multiple='first'):
+        if not jsonpath:
+            raise exceptions.SaltInvocationError(
+                "Cannot load jsonpath_rw. Please check your environment "
+                "configuration.")
         self.field = field
         self.op = op
         self.value = val

_modules/runtest/tempest_sections/base_section.py

diff --git a/_modules/runtest/tempest_sections/base_section.py b/_modules/runtest/tempest_sections/base_section.py
index 5e2ea3a..b2c12ca 100644
--- a/_modules/runtest/tempest_sections/base_section.py
+++ b/_modules/runtest/tempest_sections/base_section.py
@@ -1,6 +1,11 @@
 
 import abc
-import jsonpath_rw as jsonpath
+
+try:
+    import jsonpath_rw as jsonpath
+except ImportError:
+    jsonpath = None
+from salt import exceptions
 
 import salt
 
@@ -9,6 +14,10 @@
 class BaseSection(object):
 
     def __init__(self, pillar, runtest_opts):
+        if not jsonpath:
+            raise exceptions.SaltInvocationError(
+                "Cannot load jsonpath_rw. Please check your environment "
+                "configuration.")
         super(BaseSection, self).__init__()
         self.pillar = pillar
         self.runtest_opts = runtest_opts