SW-800: fixes

SAS/ResourceAssignment/ResourceAssigner/test/t_schedulers.py

@@ -43,12 +43,12 @@ except ImportError:
     import radb_common_testing
 
 
-# def setUpModule():
-#     return radb_common_testing.setUpModule()
-#
-#
-# def tearDownModule():
-#     return radb_common_testing.tearDownModule()
+def setUpModule():
+    return radb_common_testing.setUpModule()
+
+
+def tearDownModule():
+    return radb_common_testing.tearDownModule()
 
 
 class SchedulerTest(radb_common_testing.RADBCommonTest):
@@ -518,7 +518,7 @@ class PrioritySchedulerTest(StationSchedulerTest):
         return PriorityScheduler(task_id,
                                  specification_tree if specification_tree else self.get_specification_tree(task_id),
                                  resource_estimator if resource_estimator else self.fake_resource_estimator,
-                                 self.resource_availability_checker, self.radb._dbcreds)
+                                 self.resource_availability_checker, self.radb.dbcreds)
 
     def test_unschedule_lower_priority_future_task(self):
         """

SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/radb_common_testing.py

@@ -48,11 +48,6 @@ def tearDownModule():
 class RADBCommonTest(unittest.TestCase):
 
     def setUp(self):
-        if Postgresql is None:
-            # setUpModule isn't called when running unittests from other modules which incluse this one...
-            # so, call it here if needed.
-            setUpModule()
-
         logger.info('setting up test RA database...')
         # connect to shared test db
         self.postgresql = Postgresql()    # fresh db instead of shared one: self.postgresql = testing.postgresql.Postgresql()