Merge lp:~milner/cloud-init/unit-test-framework into lp:~cloud-init-dev/cloud-init/trunk

[Mike Milner]

Add a basic unit test framework and example tests for cloudinit.util.mergedict

To run tests type "make test"
To check code you can use "make lint" and "make pyflakes"

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2012-01-12 15:12:28 +0000
@@ -0,0 +1,14 @@
+
+all: test
+
+pylint:
+	pylint cloudinit
+
+pyflakes:
+	pyflakes .
+
+test:
+	nosetests tests/unittests/
+
+.PHONY: test pylint pyflakes
+
 
=== modified file 'debian.trunk/control'
--- debian.trunk/control	2011-12-20 21:27:33 +0000
+++ debian.trunk/control	2012-01-12 15:12:28 +0000
@@ -5,6 +5,9 @@
 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
 
 
=== added directory 'tests'
=== added directory 'tests/unittests'
=== added file 'tests/unittests/test_util.py'
--- tests/unittests/test_util.py	1970-01-01 00:00:00 +0000
+++ tests/unittests/test_util.py	2012-01-12 15:12:28 +0000
@@ -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)