From e7008d39f9d474d4f127fba320c34a72f086abdc Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 30 Aug 2019 11:23:31 +0200
Subject: [PATCH] SW-800: fixes
---
.../ResourceAssigner/test/t_schedulers.py | 14 +++++++-------
.../tests/radb_common_testing.py | 5 -----
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulers.py b/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulers.py
index d17bbe3fd2e..3a3d9efaea8 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulers.py
+++ b/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):
"""
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/radb_common_testing.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/radb_common_testing.py
index 17f64c1e357..7487aed9b10 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/radb_common_testing.py
+++ b/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()
--
GitLab