Guard reset_instance try..except

Author: pederhan

mreg_api/client.py

@@ -90,7 +90,10 @@ def __call__(cls: type[Any], *args: Any, **kwargs: Any):
 
     def reset_instance(self) -> None:
         """Reset the singleton instance (useful for testing)."""
-        del self._instances[self]
+        try:
+            del self._instances[self]
+        except KeyError:
+            pass
 
 
 class RequestRecord(NamedTuple):

tests/conftest.py

@@ -19,7 +19,7 @@ def reset_instance_after_test() -> Generator[None, None, None]:
             # FIXME: Can we force the destructor to be called?
             # MregClient()._reset_contextvars()  # pyright: ignore[reportPrivateUsage]
             MregClient.reset_instance()
-        except KeyError:
+        except Exception:
             pass