diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
index 26ae9f3ad8b655717bb149a402e391cfa062f416..b4c69fd9962ffaf11bcd0e99d0aa1d1f9f21a4ca 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/tests/t_radb_functionality.py
@@ -28,12 +28,7 @@ from pprint import pformat
logger = logging.getLogger(__name__)
-try:
- import mock
-except ImportError as e:
- print str(e)
- print 'Please install python package mock: sudo pip install mock'
- exit(3) # special lofar test exit code: skipped test
+import unittest.mock as mock
import radb_common_testing
@@ -332,7 +327,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
self.radb.getTasksTimeWindow(None, None, [])]
expected_time_windows = [[], [], []]
- self.assertItemsEqual(time_windows, expected_time_windows)
+ self.assertCountEqual(time_windows, expected_time_windows)
def test_getTasksTimeWindow_empty_db_returns_no_time_window_succeeds(self):
""" Verify if radb.getTasksTimeWindow() returns an invalid time window when requesting a time window for a
@@ -343,7 +338,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
time_window = [time_window['min_starttime'], time_window['max_endtime']]
expected_time_window = [None, None]
- self.assertItemsEqual(time_window, expected_time_window)
+ self.assertCountEqual(time_window, expected_time_window)
def test_getTasksTimeWindow_normal_use_succeeds(self):
""" Verify if radb.getTasksTimeWindow() successfully return the expected time window when requesting a time
@@ -363,7 +358,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# The time_window based on task_id, mom_id, and otdb_id should be the same
expected_time_windows = 3*[{'max_endtime': parser.parse(endtime), 'min_starttime': parser.parse(starttime)}]
- self.assertItemsEqual(time_windows, expected_time_windows)
+ self.assertCountEqual(time_windows, expected_time_windows)
def test_getTasks_no_ids_fails(self):
""" Verify if radb.getTasks() raises an exception when called with an empty ID lists for every ID type. """
@@ -385,7 +380,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
self.radb.getTasks(task_ids=None, mom_ids=None, otdb_ids=[])]
expected_tasks = [[], [], []]
- self.assertItemsEqual(tasks, expected_tasks)
+ self.assertCountEqual(tasks, expected_tasks)
def test_getTasks_empty_db_returns_empty_list_succeeds(self):
""" Verify if radb.getTasks() successfully returns an empty list when called with a task ID that is non-existing
@@ -794,7 +789,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
self.radb.insertTaskPredecessor(1, invalid_id),
self.radb.insertTaskPredecessor(invalid_id, invalid_id)]
- self.assertItemsEqual(ids, [None, None, None])
+ self.assertCountEqual(ids, [None, None, None])
def test_insertTaskPredecessor_valid_nonexisting_ids_return_none(self):
""" Verify if radb.insertTaskPredecessor() returns None when called with valid but non-existing task ID and
@@ -2542,7 +2537,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
NUM_CLAIMS = 2
NUM_CLAIMS_PER_RESOURCE = 2
RESOURCE_ID = 0
- resource_max_cap = long(self.radb.get_resource_claimable_capacity(RESOURCE_ID, now, now))
+ resource_max_cap = int(self.radb.get_resource_claimable_capacity(RESOURCE_ID, now, now))
task1_id = self.radb.insertSpecificationAndTask(1, 1, 'approved', 'observation',
now+timedelta(hours=1),
@@ -2563,7 +2558,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# and usage should be one 'block' from start->endtime
self.assertEqual(NUM_CLAIMS, len(self.radb.getResourceClaims(task_ids=task1_id, status='tentative')))
self.assertEqual([{'as_of_timestamp': task1['starttime'], 'usage': resource_max_cap },
- {'as_of_timestamp': task1['endtime'], 'usage': 0L}],
+ {'as_of_timestamp': task1['endtime'], 'usage': 0}],
self.radb.getResourceUsages(task1['starttime'], task1['endtime'], RESOURCE_ID)[RESOURCE_ID]['tentative'])
# update the claims to 'claimed' status
@@ -2576,7 +2571,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# self.assertEqual([],
# self.radb.getResourceUsages(task1['starttime'], task1['endtime'], RESOURCE_ID)[RESOURCE_ID]['tentative'])
self.assertEqual([{'as_of_timestamp': task1['starttime'], 'usage': resource_max_cap },
- {'as_of_timestamp': task1['endtime'], 'usage': 0L}],
+ {'as_of_timestamp': task1['endtime'], 'usage': 0}],
self.radb.getResourceUsages(task1['starttime'], task1['endtime'], RESOURCE_ID)[RESOURCE_ID]['claimed'])
# finish the task...
@@ -2610,7 +2605,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# and usage should be one 'block' from start->endtime
self.assertEqual(NUM_CLAIMS, len(self.radb.getResourceClaims(task_ids=task2_id, status='tentative')))
self.assertEqual([{'as_of_timestamp': task2['starttime'], 'usage': resource_max_cap },
- {'as_of_timestamp': task2['endtime'], 'usage': 0L}],
+ {'as_of_timestamp': task2['endtime'], 'usage': 0}],
self.radb.getResourceUsages(task2['starttime'], task2['endtime'], RESOURCE_ID)[RESOURCE_ID]['tentative'])
# update the claims to 'claimed' status
@@ -2623,7 +2618,7 @@ class ResourceAssignmentDatabaseTest(radb_common_testing.RADBCommonTest):
# self.assertEqual([],
# self.radb.getResourceUsages(task2['starttime'], task2['endtime'], RESOURCE_ID)[RESOURCE_ID]['tentative'])
self.assertEqual([{'as_of_timestamp': task2['starttime'], 'usage': resource_max_cap },
- {'as_of_timestamp': task2['endtime'], 'usage': 0L}],
+ {'as_of_timestamp': task2['endtime'], 'usage': 0}],
self.radb.getResourceUsages(task2['starttime'], task2['endtime'], RESOURCE_ID)[RESOURCE_ID]['claimed'])