rename one argument

Author: francesconazzaro

cads_broker/factory.py

@@ -76,9 +76,9 @@ def register_functions():
     )
     expressions.FunctionFactory.FunctionFactory.register_function(
         "user_last_completed_request",
-        lambda context, max_time=24 * 60 * 60: database.user_last_completed_request(
+        lambda context, interval=24 * 60 * 60: database.user_last_completed_request(
             user_uid=context.request.user_uid,
-            interval=max_time,
+            interval=interval,
             session=context.environment.session,
         ),
     )

tests/test_02_database.py

@@ -807,7 +807,7 @@ def test_users_last_finished_at(session_obj: sa.orm.sessionmaker) -> None:
         session.add(request_2)
         session.add(request_3)
         session.commit()
-        users_last_finished_at = db.users_last_finished_at(session=session, max_time=now - datetime.timedelta(hours=24))
+        users_last_finished_at = db.users_last_finished_at(session=session, after=now - datetime.timedelta(hours=24))
         assert finished_at == users_last_finished_at["user1"]
         assert "user2" not in users_last_finished_at
 

tests/test_20_dispatcher.py

@@ -127,64 +127,3 @@ def mock_get_tasks() -> dict[str, str]:
         # with pytest.raises(db.NoResultFound):
         #     with session_obj() as session:
         #         db.get_request(dismissed_request_uid, session=session)
-
-
-def test_processing_time_priority_algorithm(
-    mocker: pytest_mock.plugin.MockerFixture, session_obj: sa.orm.sessionmaker
-) -> None:
-    request1 = mock_system_request(user_uid="user1", request_uid="request1")
-    request2 = mock_system_request(user_uid="user1", request_uid="request2")
-
-    def mock_get_users_queue_from_processing_time():
-        return {"user1": [request1, request2]}
-
-    mocker.patch(
-        "cads_broker.database.get_users_queue_from_processing_time",
-        return_value=mock_get_users_queue_from_processing_time(),
-    )
-
-    candidates = [request1, request2]
-
-    submitted_requests = []
-
-    def mock_submit_request(self, request, priority, session):
-        submitted_requests.append(request.request_uid)
-        for candidate in candidates:
-            if candidate.request_uid == request.request_uid:
-                candidates.remove(candidate)
-
-    mocker.patch("cads_broker.dispatcher.Broker.submit_request", mock_submit_request)
-
-    environment = Environment.Environment()
-    qos = QoS.QoS(
-        rules=Rule.RuleSet(), environment=environment, rules_hash="", logger=logger
-    )
-    broker = dispatcher.Broker(
-        client=CLIENT,
-        environment=environment,
-        qos=qos,
-        address="scheduler-address",
-        session_maker_read=session_obj,
-        session_maker_write=session_obj,
-    )
-
-    checked_requests = []
-
-    def mock_can_run(request, *args, **kwargs):
-        checked_requests.append(request.request_uid)
-        return True
-
-    broker.qos.can_run = mock_can_run
-
-    broker.processing_time_priority_algorithm(
-        session_write=session_obj(), number_of_requests=5, candidates=candidates
-    )
-
-    assert submitted_requests == [request1.request_uid]
-    assert checked_requests == [request1.request_uid, request2.request_uid]
-
-    broker.processing_time_priority_algorithm(
-        session_write=session_obj(), number_of_requests=5, candidates=candidates
-    )
-
-    assert submitted_requests == [request1.request_uid, request2.request_uid]