@@ 184-192 (lines=9) @@ | ||
181 | TT.merge(dic, self.upd, ac_merge=TT.MS_DICTS) |
|
182 | self.assertTrue(dicts_equal(dic, exp)) |
|
183 | ||
184 | def test_40_update_with_merge_lists(self): |
|
185 | dic = copy.deepcopy(self.dic) |
|
186 | exp = copy.deepcopy(self.upd) |
|
187 | exp["b"]["b"] = [0] + exp["b"]["b"] |
|
188 | exp["b"]["c"] = dic["b"]["c"] |
|
189 | exp["name"] = dic["name"] |
|
190 | ||
191 | TT.merge(dic, self.upd, ac_merge=TT.MS_DICTS_AND_LISTS) |
|
192 | self.assertTrue(dicts_equal(dic, exp)) |
|
193 | ||
194 | def test_50_update_with_custom_merge(self): |
|
195 | def set_none_merge_strat(self, other, key, *args, **kwargs): |
@@ 397-402 (lines=6) @@ | ||
394 | def setUp(self): |
|
395 | super(TestBaseWithIOMultiFiles, self).setUp() |
|
396 | self.b_path = os.path.join(self.workdir, "b.json") |
|
397 | self.g_path = os.path.join(self.workdir, "*.json") |
|
398 | ||
399 | exp = copy.deepcopy(self.upd) # Assume MS_DICTS strategy was used. |
|
400 | exp["b"]["c"] = self.dic["b"]["c"] |
|
401 | exp["name"] = self.dic["name"] |
|
402 | self.exp = exp |
|
403 | ||
404 | ||
405 | class Test_40_multi_load_with_strategies(TestBaseWithIOMultiFiles): |