From 6c3ec50a43692aeac1776e6247f2668fa24da501 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 18 Dec 2014 15:53:18 -0500
Subject: Updated with more tests

---
 test/units/mutli_ec2_test.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/test/units/mutli_ec2_test.py b/test/units/mutli_ec2_test.py
index 4e6fe61c5..ab76629b1 100755
--- a/test/units/mutli_ec2_test.py
+++ b/test/units/mutli_ec2_test.py
@@ -60,6 +60,34 @@ class MultiEc2Test(unittest.TestCase):
         [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]]
         self.assertEqual(result, {"a": {"b": {"c": [1,2]}}})
 
+    def test_merge_recursive_array_item(self):
+        a = {"a" : {"b": {"c": [1]}}}
+        b = {"a" : {"b": {"c": 2}}}
+        result = {}
+        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]]
+        self.assertEqual(result, {"a": {"b": {"c": [1,2]}}})
+
+    def test_merge_recursive_hash_item(self):
+        a = {"a" : {"b": {"c": {"d": 1}}}}
+        b = {"a" : {"b": {"c": 2}}}
+        result = {}
+        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]]
+        self.assertEqual(result, {"a": {"b": {"c": [{"d": 1}, 2]}}})
+
+    def test_merge_recursive_array_hash(self):
+        a = {"a" : [{"b": {"c":  1}}]}
+        b = {"a" : {"b": {"c": 1}}}
+        result = {}
+        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]]
+        self.assertEqual(result, {"a": [{"b": {"c": 1}}]})
+
+    def test_merge_recursive_hash_array(self):
+        a = {"a" : {"b": {"c": 1}}}
+        b = {"a" : [{"b": {"c":  1}}]}
+        result = {}
+        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]]
+        self.assertEqual(result, {"a": [{"b": {"c": 1}}]})
+
     def tearDown(self):
         pass
 
-- 
cgit v1.2.3