| commit | a95eaa35f5c48417420fe37472d8148fdbf5ddd5 | [log] [tgz] |
|---|---|---|
| author | martin f. krafft <madduck@madduck.net> | Sun Jun 16 11:56:41 2013 +0200 |
| committer | martin f. krafft <madduck@madduck.net> | Sun Jun 16 11:56:41 2013 +0200 |
| tree | 1d5bd053ad8deacda62570b1cc1ced986b0c99a0 | |
| parent | a07b4208dcf30cdab35a8021c54a767f0b47cf3c [diff] [blame] |
Handle merging None into lists/dicts Signed-off-by: martin f. krafft <madduck@madduck.net>
diff --git a/mergers/dict/tests/test_update.py b/mergers/dict/tests/test_update.py index 8e35c53..02702f7 100644 --- a/mergers/dict/tests/test_update.py +++ b/mergers/dict/tests/test_update.py
@@ -20,3 +20,8 @@ assert len(ret) == 4 for k,v in ret.iteritems(): assert k == v + + def test_merge_with_none(self): + first = {1:2,3:4} + ret = self.merger.merge(first, None) + assert ret == first