Skip to content

Commit cd837df

Browse files
fix tests
1 parent 6d5d960 commit cd837df

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tests/test_02_database.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,13 @@ def test_get_users_queue_from_processing_time(session_obj: sa.orm.sessionmaker)
747747
started_at=None,
748748
finished_at=datetime.datetime.now() - datetime.timedelta(hours=10),
749749
)
750+
request_8 = mock_system_request(
751+
status="deleted",
752+
adaptor_properties_hash=adaptor_properties.hash,
753+
user_uid="user2",
754+
started_at=datetime.datetime.now() - datetime.timedelta(hours=15),
755+
finished_at=datetime.datetime.now() - datetime.timedelta(hours=10),
756+
)
750757
with session_obj() as session:
751758
session.add(adaptor_properties)
752759
session.add(request_1)
@@ -756,14 +763,15 @@ def test_get_users_queue_from_processing_time(session_obj: sa.orm.sessionmaker)
756763
session.add(request_5)
757764
session.add(request_6)
758765
session.add(request_7)
766+
session.add(request_8)
759767
session.commit()
760768
with session_obj() as session:
761769
users_cost = db.get_users_queue_from_processing_time(
762770
session, interval_stop=datetime.datetime.now()
763771
)
764772
assert users_cost["user3"] == 0
765773
assert users_cost["user1"] == 15 * 60 * 60
766-
assert users_cost["user2"] == 30 * 60 * 60
774+
assert users_cost["user2"] == (10 + 20 + 5) * 60 * 60
767775

768776

769777
def test_get_request_result(session_obj: sa.orm.sessionmaker) -> None:

tests/test_20_dispatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def mock_get_users_queue_from_processing_time():
147147

148148
submitted_requests = []
149149

150-
def mock_submit_request(self, request, session):
150+
def mock_submit_request(self, request, priority, session):
151151
submitted_requests.append(request.request_uid)
152152
for candidate in candidates:
153153
if candidate.request_uid == request.request_uid:

0 commit comments

Comments
 (0)