From 82ca374eeb4c949222135a9ee9da6d901789ab1b Mon Sep 17 00:00:00 2001
From: Florin Barbu <barbu_florin_adrian@yahoo.com>
Date: Thu, 30 Jan 2025 17:33:16 +0200
Subject: [PATCH] test_: cleanup all containers

---
 _assets/ci/Jenkinsfile.tests-rpc        | 2 +-
 _assets/scripts/run_functional_tests.sh | 2 +-
 tests-functional/conftest.py            | 7 ++++---
 tests-functional/tests/test_cases.py    | 5 +++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/_assets/ci/Jenkinsfile.tests-rpc b/_assets/ci/Jenkinsfile.tests-rpc
index 3bfdc4c0c9..a1e9a7c8e1 100644
--- a/_assets/ci/Jenkinsfile.tests-rpc
+++ b/_assets/ci/Jenkinsfile.tests-rpc
@@ -79,7 +79,7 @@ pipeline {
       cleanup {
         script {
           sh '''
-            docker ps -a --filter "name=status-go-func-tests-${BUILD_ID}" -q | xargs -r docker rm
+            docker ps -a --filter "name=status-go-func-tests-${BUILD_ID}" -q | xargs -r docker rm -f
             make git-clean
           '''
         }
diff --git a/_assets/scripts/run_functional_tests.sh b/_assets/scripts/run_functional_tests.sh
index ebb63ef842..923bd704aa 100755
--- a/_assets/scripts/run_functional_tests.sh
+++ b/_assets/scripts/run_functional_tests.sh
@@ -30,7 +30,7 @@ project_name="status-go-func-tests-${identifier}"
 export STATUS_BACKEND_URLS=$(eval echo http://${project_name}-status-backend-{1..${STATUS_BACKEND_COUNT}}:3333 | tr ' ' ,)
 
 # Remove orphans
-docker ps -a --filter "status-go-func-tests-${identifier}" --filter "status=exited" -q | xargs -r docker rm
+docker ps -a --filter "status-go-func-tests-${identifier}" --filter "status=exited" -q | xargs -r docker rm -f
 
 # Run docker
 echo -e "${GRN}Running tests${RST}, HEAD: $(git rev-parse HEAD)"
diff --git a/tests-functional/conftest.py b/tests-functional/conftest.py
index 1df981c2ec..26e020720c 100644
--- a/tests-functional/conftest.py
+++ b/tests-functional/conftest.py
@@ -77,8 +77,9 @@ def pytest_configure(config):
 
 
 @pytest.fixture(scope="function", autouse=True)
-def close_status_backend_containers():
-    option.status_backend_containers = []
+def close_status_backend_containers(request):
     yield
+    if hasattr(request.node.instance, "reuse_container"):
+        return
     for container in option.status_backend_containers:
-        container.kill()
+        container.kill()  # type: ignore
diff --git a/tests-functional/tests/test_cases.py b/tests-functional/tests/test_cases.py
index 1a3048491b..043da90a95 100644
--- a/tests-functional/tests/test_cases.py
+++ b/tests-functional/tests/test_cases.py
@@ -25,6 +25,7 @@ def setup_method(self):
 
 class StatusBackendTestCase:
 
+    reuse_container = True  # Skip close_status_backend_containers cleanup
     await_signals = [SignalType.NODE_LOGIN.value]
 
     network_id = 31337
@@ -37,6 +38,10 @@ def setup_class(self):
         self.rpc_client.restore_account_and_login()
         self.rpc_client.wait_for_login()
 
+    def teardown_class(self):
+        for container in option.status_backend_containers:
+            container.kill()
+
 
 class WalletTestCase(StatusBackendTestCase):