create a copy before return

facebookresearch · Jan 22, 2021 · 353af48 · 353af48
1 parent ed75222
commit 353af48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/hydra/core/singleton.py b/hydra/core/singleton.py
@@ -18,14 +18,15 @@ def instance(cls: Any, *args: Any, **kwargs: Any) -> Any:
 
     @staticmethod
     def get_state() -> Any:
+        instances = deepcopy(Singleton._instances)
         try:
             from hydra.core.plugins import Plugins
 
-            del Singleton._instances[Plugins]
+            del instances[Plugins]
         except KeyError:
             pass
         return {
-            "instances": Singleton._instances,
+            "instances": instances,
             "omegaconf_resolvers": deepcopy(BaseContainer._resolvers),
         }
 

diff --git a/tests/test_config_repository.py b/tests/test_config_repository.py
@@ -174,6 +174,14 @@ def test_get_config_header(cfg_text: str, expected: Any, sep: str) -> None:
             ConfigSource._get_header_dict(cfg_text)
 
 
+def test_singleton_get_state(hydra_restore_singletons: Any) -> None:
+    s = Singleton.get_state()
+    assert Plugins not in s["instances"]
+    assert Plugins in Singleton._instances
+    Singleton.set_state(s)
+    assert Plugins in Singleton._instances
+
+
 def test_restore_singleton_state_hack() -> None:
     """
     This is a hack that allow us to undo changes to the ConfigStore.