From 1079cab71db58b92e43d2b920ae18c05e0ea8cd3 Mon Sep 17 00:00:00 2001
From: Mike Milner <mike.milner@canonical.com>
Date: Thu, 12 Jan 2012 15:31:19 +0100
Subject: Add initial unit test framework. Add initial tests for mergedict.

---
 Makefile                     | 14 ++++++++++++
 tests/unittests/test_util.py | 53 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 Makefile
 create mode 100644 tests/unittests/test_util.py

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..9bc7e8a2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+
+all: test pylint pyflakes
+
+pylint:
+	-pylint cloudinit
+
+pyflakes:
+	-pyflakes .
+
+test:
+	-nosetests tests/unittests/
+
+.PHONY: test pylint pyflakes
+
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
new file mode 100644
index 00000000..34a073d9
--- /dev/null
+++ b/tests/unittests/test_util.py
@@ -0,0 +1,53 @@
+from unittest import TestCase
+
+from cloudinit.util import mergedict
+
+class TestMergeDict(TestCase):
+    def test_simple_merge(self):
+        source = {"key1": "value1"}
+        candidate = {"key2": "value2"}
+        result = mergedict(source, candidate)
+        self.assertEqual({"key1": "value1", "key2": "value2"}, result)
+
+    def test_nested_merge(self):
+        source = {"key1": {"key1.1": "value1.1"}}
+        candidate = {"key1": {"key1.2": "value1.2"}}
+        result = mergedict(source, candidate)
+        self.assertEqual(
+            {"key1": {"key1.1": "value1.1", "key1.2": "value1.2"}}, result)
+
+    def test_merge_does_not_override(self):
+        source = {"key1": "value1", "key2": "value2"}
+        candidate = {"key2": "value2", "key2": "NEW VALUE"}
+        result = mergedict(source, candidate)
+        self.assertEqual(source, result)
+
+    def test_empty_candidate(self):
+        source = {"key": "value"}
+        candidate = {}
+        result = mergedict(source, candidate)
+        self.assertEqual(source, result)
+
+    def test_empty_source(self):
+        source = {}
+        candidate = {"key": "value"}
+        result = mergedict(source, candidate)
+        self.assertEqual(candidate, result)
+
+    def test_non_dict_candidate(self):
+        source = {"key": "value"}
+        candidate = "not a dict"
+        result = mergedict(source, candidate)
+        self.assertEqual(source, result)
+
+    def test_non_dict_source(self):
+        source = "not a dict"
+        candidate = {"key": "value"}
+        result = mergedict(source, candidate)
+        self.assertEqual(source, result)
+
+    def test_neither_dict(self):
+        source = "source"
+        candidate = "candidate"
+        result = mergedict(source, candidate)
+        self.assertEqual(source, result)
-- 
cgit v1.2.3


From 79c43bb0f48333ddfa65c6fb4596cb3528fb8708 Mon Sep 17 00:00:00 2001
From: Mike Milner <mike.milner@canonical.com>
Date: Thu, 12 Jan 2012 15:47:53 +0100
Subject: Add test dependencies to Build-Depends.

---
 debian.trunk/control | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian.trunk/control b/debian.trunk/control
index 76d0db0d..c877f673 100644
--- a/debian.trunk/control
+++ b/debian.trunk/control
@@ -5,6 +5,9 @@ Maintainer: Scott Moser <smoser@ubuntu.com>
 Build-Depends: cdbs, 
                debhelper (>= 5.0.38), 
                python (>= 2.6.6-3~),
+               python-nose,
+               pyflakes,
+               pylint,
 XS-Python-Version: all
 Standards-Version: 3.9.1
 
-- 
cgit v1.2.3


From dc6fa5f447599ea097ecf31023ba30aa5de5accf Mon Sep 17 00:00:00 2001
From: Mike Milner <mike.milner@canonical.com>
Date: Thu, 12 Jan 2012 16:06:27 +0100
Subject: Tweak Makefile to just run unittests for the "all" target.

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9bc7e8a2..0fc6c46b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 
-all: test pylint pyflakes
+all: test
 
 pylint:
-	-pylint cloudinit
+	pylint cloudinit
 
 pyflakes:
-	-pyflakes .
+	pyflakes .
 
 test:
-	-nosetests tests/unittests/
+	nosetests tests/unittests/
 
 .PHONY: test pylint pyflakes
 
-- 
cgit v1.2.3