Use identifier

Author: cmanallen

tests/conftest.py

@@ -187,16 +187,9 @@ def reset_integrations():
 
 @pytest.fixture
 def uninstall_integration():
-    """
-    Forces the next call to sentry_init to re-install an integration and call `setup_once`.
-    No effect if the integration is not installed.
-    """
+    """Use to force the next call to sentry_init to re-install/setup an integration."""
 
-    def inner(name_or_cls):
-        if isinstance(name_or_cls, str):
-            identifier = name_or_cls
-        else:
-            identifier = name_or_cls.identifier
+    def inner(identifier):
         _processed_integrations.discard(identifier)
         _installed_integrations.discard(identifier)
 

tests/integrations/unleash/test_unleash.py

@@ -12,7 +12,7 @@
 
 
 def test_is_enabled(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -35,7 +35,7 @@ def test_is_enabled(sentry_init, capture_events, uninstall_integration):
 
 
 def test_get_variant(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -64,7 +64,7 @@ def test_get_variant(sentry_init, capture_events, uninstall_integration):
 
 
 def test_is_enabled_threaded(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -113,7 +113,7 @@ def task(flag_key):
 
 
 def test_get_variant_threaded(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -164,7 +164,7 @@ def task(flag_key):
 @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
 def test_is_enabled_asyncio(sentry_init, capture_events, uninstall_integration):
     asyncio = pytest.importorskip("asyncio")
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -216,7 +216,7 @@ async def runner():
 def test_get_variant_asyncio(sentry_init, capture_events, uninstall_integration):
     asyncio = pytest.importorskip("asyncio")
 
-    uninstall_integration(UnleashIntegration)
+    uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
         client = UnleashClient()
@@ -273,7 +273,7 @@ def test_wraps_original(sentry_init, uninstall_integration):
         client.is_enabled = mock_is_enabled
         client.get_variant = mock_get_variant
 
-        uninstall_integration(UnleashIntegration)
+        uninstall_integration(UnleashIntegration.identifier)
         sentry_init(integrations=[UnleashIntegration()])  # type: ignore
 
     res = client.is_enabled("test-flag", "arg", kwarg=1)
@@ -298,7 +298,7 @@ def test_wrapper_attributes(sentry_init, uninstall_integration):
         original_is_enabled = client.is_enabled
         original_get_variant = client.get_variant
 
-        uninstall_integration(UnleashIntegration)
+        uninstall_integration(UnleashIntegration.identifier)
         sentry_init(integrations=[UnleashIntegration()])  # type: ignore
 
         # Mock clients methods have not lost their qualified names after decoration.