From 362b1f05f379bcc49e945c1c74e4523e24728e7a Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Tue, 7 May 2024 14:52:13 +0200 Subject: [PATCH 1/2] TST: catch Artifactory error during tear down --- tests/conftest.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 508b4df2..c9631d5e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,7 @@ import getpass import os +import dohq_artifactory import pytest import audeer @@ -94,7 +95,17 @@ def interface(tmpdir_factory, request): yield interface if artifactory: - backend._repo.delete() + try: + backend._repo.delete() + except dohq_artifactory.exception.ArtifactoryException: + # It might happen from time to time, + # that a repository cannot be deleted. + # In those cases, + # we don't raise an error here, + # but rely on the user calling the clean up script + # from time to time: + # $ python tests/misc/cleanup_artifactory.py + pass if not artifactory: backend_cls.delete(host, repository) From 9a6f78b6be0681ca23ffb6dc06018276ca798721 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Tue, 7 May 2024 14:56:02 +0200 Subject: [PATCH 2/2] Import dohq_artifactory only if needed --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index c9631d5e..3ea04592 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,6 @@ import getpass import os -import dohq_artifactory import pytest import audeer @@ -95,6 +94,8 @@ def interface(tmpdir_factory, request): yield interface if artifactory: + import dohq_artifactory + try: backend._repo.delete() except dohq_artifactory.exception.ArtifactoryException: