revert merge_into_sc_element_type:merging_into_none testcase

Jasha10 · Jasha10 · commit 79a3e5757111 · 2021-06-12T19:21:51.000-05:00
diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -277,7 +277,7 @@
         ),
         param(
             (
-                DictConfig({"user007": "???"}, element_type=User),
+                DictConfig({"user007": None}, element_type=User),
                 {"user007": {"age": 99}},
             ),
             {"user007": {"name": "???", "age": 99}},

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@`
`277`	`277`	`),`
`278`	`278`	`param(`
`279`	`279`	`(`
`280`		`- DictConfig({"user007": "???"}, element_type=User),`
	`280`	`+ DictConfig({"user007": None}, element_type=User),`
`281`	`281`	`{"user007": {"age": 99}},`
`282`	`282`	`),`
`283`	`283`	`{"user007": {"name": "???", "age": 99}},`