From 0414cd20428adeff47b118831bc6e8d948c22101 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 9 Nov 2018 12:45:42 +0000
Subject: [PATCH] SW-44: fixed test which asseumed there were still claims for
finished tasks
---
.../tests/t_radb_functionality.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
index 92bf83e1250..ae6b3fce361 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
@@ -1055,15 +1055,15 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# when a task is > queued (for example, finished)
# then we don't want conflict statuses anymore if we update start/endtimes
# test here with weird starttime shift back to overlap with task1
- self.assertTrue(self.radb.updateTask(task_id2, task_status='finished'))
- self.assertEqual('finished', self.radb.getTask(task_id2)['status'])
+ self.assertTrue(self.radb.updateTask(task_id2, task_status='active'))
+ self.assertEqual('active', self.radb.getTask(task_id2)['status'])
self.assertTrue(self.radb.updateTaskAndResourceClaims(task_id2, starttime=task1['starttime']))
- self.assertEqual('finished', self.radb.getTask(task_id2)['status'])
+ self.assertEqual('active', self.radb.getTask(task_id2)['status'])
self.assertEqual('claimed', self.radb.getResourceClaim(t2_claim_ids[0])['status'])
#ok, that works, now set the start/end time back to 'normal' for some later test cases
self.assertTrue(self.radb.updateTaskAndResourceClaims(task_id2, starttime=now+timedelta(hours=2), endtime=now+timedelta(hours=3)))
- self.assertEqual('finished', self.radb.getTask(task_id2)['status'])
+ self.assertEqual('active', self.radb.getTask(task_id2)['status'])
self.assertEqual('claimed', self.radb.getResourceClaim(t2_claim_ids[0])['status'])
@@ -2632,3 +2632,4 @@ if __name__ == "__main__":
os.environ['TZ'] = 'UTC'
logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
unittest.main()
+
--
GitLab