From beec5df1015ecbd257f59ed0a6b1f98604cf80d2 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 9 Jun 2017 12:29:11 +0000
Subject: [PATCH] Task #10898: more checks
---
.../ResourceAssignmentDatabase/tests/t_radb.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py
index 9c04e2b2265..0d819be9d7f 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py
@@ -1055,7 +1055,7 @@ class ResourceAssignmentDatabaseTest(unittest.TestCase):
'status': 'claimed',
'claim_size': 10 }
t1_faulty_claim_ids = self.radb.insertResourceClaims(task_id1, [t1_claim2], 'foo', 1, 1)
- self.assertEqual(0, len(t1_faulty_claim_ids))
+ self.assertEqual(1, len(self.radb.getResourceClaims(task_ids=task_id1))) #there should still be one (proper/non-faulty) claim for this task
# try to insert a claim with the wrong (already 'conflict') status. Should rollback, and return no ids.
t1_claim3 = { 'resource_id': 117,
@@ -1064,7 +1064,8 @@ class ResourceAssignmentDatabaseTest(unittest.TestCase):
'status': 'conflict',
'claim_size': 10 }
t1_faulty_claim_ids = self.radb.insertResourceClaims(task_id1, [t1_claim3], 'foo', 1, 1)
- self.assertEqual(0, len(t1_faulty_claim_ids))
+ t1_faulty_claim_ids = self.radb.insertResourceClaims(task_id1, [t1_claim2], 'foo', 1, 1)
+ self.assertEqual(1, len(self.radb.getResourceClaims(task_ids=task_id1))) #there should still be one (proper/non-faulty) claim for this task
# try to update the task status to scheduled, should not succeed, since it's claims are not 'claimed' yet.
self.assertFalse(self.radb.updateTask(task_id1, task_status='scheduled'))
--
GitLab