From c3ecf94998f1a59b59d725624862ec7d6519150f Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Tue, 16 May 2017 09:25:52 +0000 Subject: [PATCH] Task #9893: Fixed test broken by refactoring --- .../ResourceAssigner/test/t_schedulechecker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulechecker.py b/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulechecker.py index 129f491384d..8ef2c28b74b 100755 --- a/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulechecker.py +++ b/SAS/ResourceAssignment/ResourceAssigner/test/t_schedulechecker.py @@ -57,7 +57,7 @@ class ScheduleCheckerTest(unittest.TestCase): # Default return values self.rarpc_mock.getTasks.return_value = [ { 'id': 'id', 'mom_id': '1', 'otdb_id': 'otdb_id', 'status': 'approved', 'type': 'observation', 'specification_id': 'specification_id' } ] - self.momrpc_mock.getProjectDetails.return_value = { 1: { 'object_status': 'approved' } } + self.momrpc_mock.getObjectDetails.return_value = { 1: { 'object_status': 'approved' } } self.rarpc_mock.deleteSpecification.return_value = True self.curpc_mock.getPathForOTDBId.return_value = { 'found': True } @@ -138,7 +138,7 @@ class ScheduleCheckerTest(unittest.TestCase): def test_checkUnRunTasksForMoMOpenedStatus_mom_opened_otdb_approved(self): """ Test if a MoM task on 'opened' and in OTDB on 'approved' causes the task to be deleted. """ - self.momrpc_mock.getProjectDetails.return_value = { 1: { 'object_status': 'opened' } } + self.momrpc_mock.getObjectDetails.return_value = { 1: { 'object_status': 'opened' } } with TestingScheduleChecker(self.rarpc_mock, self.momrpc_mock, self.curpc_mock) as schedulechecker: schedulechecker.checkUnRunTasksForMoMOpenedStatus() @@ -148,7 +148,7 @@ class ScheduleCheckerTest(unittest.TestCase): def test_checkUnRunTasksForMoMOpenedStatus_mom_approved_otdb_approved(self): """ Test if a MoM task on 'approved' and in OTDB on 'approved' causes the task NOT to be deleted. """ - self.momrpc_mock.getProjectDetails.return_value = { 1: { 'object_status': 'approved' } } + self.momrpc_mock.getObjectDetails.return_value = { 1: { 'object_status': 'approved' } } with TestingScheduleChecker(self.rarpc_mock, self.momrpc_mock, self.curpc_mock) as schedulechecker: schedulechecker.checkUnRunTasksForMoMOpenedStatus() @@ -158,7 +158,7 @@ class ScheduleCheckerTest(unittest.TestCase): def test_checkUnRunTasksForMoMOpenedStatus_mom_notexisting_otdb_approved(self): """ Test if a task is not in MoM, and 'approved' in OTDB. This causes the task to be deleted. """ - self.momrpc_mock.getProjectDetails.return_value = {} + self.momrpc_mock.getObjectDetails.return_value = {} with TestingScheduleChecker(self.rarpc_mock, self.momrpc_mock, self.curpc_mock) as schedulechecker: schedulechecker.checkUnRunTasksForMoMOpenedStatus() -- GitLab