Load prepared images by decorator (Azure#30475)

Author: Yalin Li

sdk/containerregistry/azure-containerregistry/tests/conftest.py

@@ -4,18 +4,33 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-
 import os
-
 import pytest
-from devtools_testutils import add_general_regex_sanitizer, add_body_key_sanitizer, add_uri_regex_sanitizer, test_proxy
-
-# Fixture
-from testcase import load_registry
+from devtools_testutils import (
+    add_general_regex_sanitizer,
+    add_body_key_sanitizer,
+    add_uri_regex_sanitizer,
+    test_proxy,
+    is_live,
+)
+from testcase import get_authority, import_image
 
-
-def pytest_configure(config):
-    config.addinivalue_line("usefixtures", "load_registry")
+@pytest.fixture(scope="session", autouse=True)
+def load_registry():
+    if not is_live():
+        return
+    authority = get_authority(os.environ.get("CONTAINERREGISTRY_ENDPOINT"))
+    authority_anon = get_authority(os.environ.get("CONTAINERREGISTRY_ANONREGISTRY_ENDPOINT"))
+    repo = "library/hello-world"
+    tags = [
+        "library/hello-world:latest",
+        "library/hello-world:v1"
+    ]
+    try:
+        import_image(authority, repo, tags)
+        import_image(authority_anon, repo, tags, is_anonymous=True)
+    except Exception as e:
+        print(e)
 
 @pytest.fixture(scope="session", autouse=True)
 def add_sanitizers(test_proxy):

sdk/containerregistry/azure-containerregistry/tests/testcase.py

@@ -14,7 +14,7 @@
 from azure.mgmt.containerregistry.models import ImportImageParameters, ImportSource, ImportMode
 from azure.identity import DefaultAzureCredential, AzureAuthorityHosts, ClientSecretCredential
 
-from devtools_testutils import AzureRecordedTestCase, is_live, FakeTokenCredential
+from devtools_testutils import AzureRecordedTestCase, FakeTokenCredential
 
 logger = logging.getLogger()
 
@@ -154,23 +154,3 @@ def import_image(authority, repository, tags, is_anonymous=False):
     )
 
     result.wait()
-
-@pytest.fixture(scope="session")
-def load_registry():
-    if not is_live():
-        return
-    authority = get_authority(os.environ.get("CONTAINERREGISTRY_ENDPOINT"))
-    authority_anon = get_authority(os.environ.get("CONTAINERREGISTRY_ANONREGISTRY_ENDPOINT"))
-    repo = "library/hello-world"
-    tags = [
-        [
-            "library/hello-world:latest",
-            "library/hello-world:v1"
-        ]
-    ]
-    for tag in tags:
-        try:
-            import_image(authority, repo, tag)
-            import_image(authority_anon, repo, tag, is_anonymous=True)
-        except Exception as e:
-            print(e)