WIP

tests/test_conveyor_submitter.py

@@ -93,6 +93,27 @@ def _forge_requests_creation_time(*, session=None):
     assert requests_id_in_submission_order == [r['id'] for r in requests]
 
 
+@pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER])
+def test_ignore_requests_from_expired_rules(rse_factory, did_factory, root_account):
+    src_rse_name, src_rse_id = rse_factory.make_posix_rse()
+    dst_rse_name, dst_rse_id = rse_factory.make_posix_rse()
+    distance_core.add_distance(src_rse_id, dst_rse_id, distance=10)
+
+    did = did_factory.upload_test_file(rse_name=src_rse_name)
+    rule = rule_core.add_rule(dids=[did], account=root_account, copies=1,
+                              rse_expression=dst_rse_name, grouping='ALL',
+                              weight=None, lifetime=-1, locked=False,
+                              subscription_id=None)[0]
+    request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
+    assert request_core.get_request(request_id=request['id'])['state'] == RequestState.QUEUED
+
+    submitter(once=True,
+              rses=[{'id': rse_id} for rse_id in (src_rse_id, dst_rse_id)],
+              partition_wait_time=None, transfertools=['mock'],
+              transfertype='single', filter_transfertool=None)
+    assert request_core.get_request(request_id=request['id'])['state'] == RequestState.QUEUED
+
+
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER])
 @pytest.mark.parametrize("core_config_mock", [
     # Run test twice: with, and without, temp tables