add another merge test case

omry · Jan 27, 2021 · a480938 · a480938
1 parent 9ad3ca8
commit a480938
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/omegaconf/basecontainer.py b/omegaconf/basecontainer.py
@@ -352,7 +352,7 @@ def expand(node: Container) -> None:
                 is_structured_config(dest._metadata.element_type)
                 and not missing_src_value
             ):
-                if OmegaConf.is_none(dest, key):
+                if OmegaConf.is_none(dest, key) or OmegaConf.is_missing(dest, key):
                     dest[key] = DictConfig(
                         content=dest._metadata.element_type, parent=dest
                     )

diff --git a/omegaconf/omegaconf.py b/omegaconf/omegaconf.py
@@ -532,7 +532,7 @@ def to_container(
         )
 
     @staticmethod
-    def is_missing(cfg: Any, key: Union[int, str]) -> bool:
+    def is_missing(cfg: Any, key: DictKeyType) -> bool:
         assert isinstance(cfg, Container)
         try:
             node = cfg._get_node(key)

diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -181,6 +181,17 @@
             id="inter:node_over_node_interpolation",
         ),
         # Structured configs
+        (
+            (DictConfig({}, element_type=User), {"user007": {"age": 99}}),
+            {"user007": {"name": "???", "age": 99}},
+        ),
+        (
+            (
+                DictConfig({"user007": "???"}, element_type=User),
+                {"user007": {"age": 99}},
+            ),
+            {"user007": {"name": "???", "age": 99}},
+        ),
         (
             (
                 DictConfig({"user007": User("bond", 7)}, element_type=User),