Tests: bring back full stager test

fts_qos is a drop-in substitute to fts_bringonline.
mlassnig · Jan 22, 2024 · 0be980d · 0be980d
1 parent ea4cdb2
commit 0be980d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/etc/docker/dev/fts/entrypoint.sh b/etc/docker/dev/fts/entrypoint.sh
@@ -37,5 +37,6 @@ update-ca-trust
 
 # startup the FTS services
 /usr/sbin/fts_server               # main FTS server daemonizes
+/usr/sbin/fts_qos                  # for the stager tests
 /usr/sbin/fts_msg_bulk             # daemon to send messages to activemq
 /usr/sbin/httpd -DFOREGROUND       # FTS REST frontend & FTSMON
diff --git a/tests/test_conveyor.py b/tests/test_conveyor.py
@@ -823,7 +823,6 @@ def test_non_deterministic_dst(did_factory, did_client, root_account, vo, caches
 
 
 @skip_rse_tests_with_accounts
-@pytest.mark.dirty(reason="Submits a transfer to FTS which cannot be ever executed in this test env.")
 @pytest.mark.noparallel(groups=[NoParallelGroups.STAGER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 def test_stager(rse_factory, did_factory, root_account, replica_client):
     """
@@ -861,8 +860,8 @@ def test_stager(rse_factory, did_factory, root_account, replica_client):
                                            'requested_at': datetime.utcnow()}])
     stager(once=True, rses=[{'id': rse_id} for rse_id in all_rses])
 
-    request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
-    assert request['state'] == RequestState.SUBMITTED
+    replica = __wait_for_replica_transfer(dst_rse_id=dst_rse_id, max_wait_seconds=2 * MAX_POLL_WAIT_SECONDS, **did)
+    assert replica['state'] == ReplicaState.AVAILABLE
 
 
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.FINISHER])