diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb.py index 9c04e2b22654de6f1137a9e6d606a6165e0f48e0..0d819be9d7f5a36c59210164d96f06cc2cf1cf44 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'))