Merge pull request #296 from joergsteffens/dev/joergs/master/python-fix

systemtests: python-bareos-unittest: bugfixes
bareos · Oct 4, 2019 · fcc2baf · fcc2baf
2 parents 611cb16 + 2afc0d5
commit fcc2baf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/systemtests/tests/python-bareos-test/python-bareos-unittest.py b/systemtests/tests/python-bareos-test/python-bareos-unittest.py
@@ -206,15 +206,15 @@ class PythonBareosJsonBase(PythonBareosBase):
     @staticmethod
     def check_resource(director, resourcesname, name):
         logger = logging.getLogger()
-        result = False
+        rc = False
         try:
             result = director.call(u'.{}'.format(resourcesname))
             for i in result[resourcesname]:
                 if i['name'] == name:
-                    result = True
+                    rc = True
         except Exception as e:
             logger.warn(str(e))
-        return result
+        return rc
 
     @staticmethod
     def check_console(director, name):
@@ -228,7 +228,9 @@ def configure_add(self, director, resourcesname, resourcename, cmd):
         if not self.check_resource(director, resourcesname, resourcename):
             result = director.call('configure add {}'.format(cmd))
             self.assertEqual(result['configure']['add']['name'], resourcename)
-            self.assertTrue(self.check_jobname(director, resourcename))
+            self.assertTrue(
+                self.check_resource(director, resourcesname, resourcename),
+                u'Failed to find resource {} in {}.'.format(resourcename, resourcesname))
 
     def run_job(self, director, jobname, level, wait=False):
         logger = logging.getLogger()