@@ 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 | # vim:sw=4:ts=4:et: |
|
195 |
@@ 397-402 (lines=6) @@ | ||
394 | self._check_multi_load_with_strategy(exp, merge=None) |
|
395 | self._check_multi_load_with_strategy(exp) |
|
396 | ||
397 | def test_20_merge_dicts_and_lists(self): |
|
398 | exp = copy.deepcopy(self.upd) |
|
399 | exp["b"]["b"] = [0] + self.upd["b"]["b"] |
|
400 | exp["b"]["c"] = self.dic["b"]["c"] |
|
401 | exp["name"] = self.dic["name"] |
|
402 | self._check_multi_load_with_strategy(exp, merge=TT.MS_DICTS_AND_LISTS) |
|
403 | ||
404 | def test_30_merge_with_replace(self): |
|
405 | exp = copy.deepcopy(self.upd) |