summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:46:52 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:46:52 -0700
commitc972396ecccb4b67eafc038a482ffeaa1df2c93e (patch)
treec21c284291916a74c7187b3b8b112085947e5f9e /tests
parent4a669649b17cf01b6f89f7902b6683d02ef0bee1 (diff)
downloadvyos-cloud-init-c972396ecccb4b67eafc038a482ffeaa1df2c93e.tar.gz
vyos-cloud-init-c972396ecccb4b67eafc038a482ffeaa1df2c93e.zip
A few more tests + cleanings.
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_merging.py24
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py
index f83522d7..cff8ac12 100644
--- a/tests/unittests/test_merging.py
+++ b/tests/unittests/test_merging.py
@@ -119,6 +119,30 @@ class TestSimpleRun(helpers.ResourceUsingTestCase):
'1': '2',
'b': {
'f': 'g',
+ 'e': 'c',
+ 'h': 'd',
+ 'hh': {
+ '1': 2,
+ },
+ }
+ }
+ b = {
+ 'b': {
+ 'e': 'c',
+ 'hh': {
+ '3': 4,
+ }
+ }
+ }
+ c = _old_mergedict(a, b)
+ d = util.mergemanydict([a, b])
+ self.assertEquals(c, d)
+
+ def test_compat_merge_sub_dict2(self):
+ a = {
+ '1': '2',
+ 'b': {
+ 'f': 'g',
}
}
b = {