add test_nocloud unit tests, fix one issue found

2 files changed, 58 insertions, 0 deletions

diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index 5ccd6b99..097bbc52 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -205,6 +205,8 @@ def parse_cmdline_data(ds_id, fill, cmdline=None):
     # short2long mapping to save cmdline typing
     s2l = {"h": "local-hostname", "i": "instance-id", "s": "seedfrom"}
     for item in kvpairs:
+        if item == "":
+            continue
         try:
             (k, v) = item.split("=", 1)
         except:
diff --git a/tests/unittests/test_datasource/test_nocloud.py b/tests/unittests/test_datasource/test_nocloud.py
new file mode 100644
index 00000000..850d3214
--- /dev/null
+++ b/tests/unittests/test_datasource/test_nocloud.py
@@ -0,0 +1,56 @@
+from cloudinit.sources import DataSourceNoCloud
+
+from mocker import MockerTestCase
+
+
+class TestNoCloudDataSource(MockerTestCase):
+
+    def setUp(self):
+        super(TestNoCloudDataSource, self).setUp()
+
+    def test_parse_cmdline_data_valid(self):
+        parse = DataSourceNoCloud.parse_cmdline_data
+
+        ds_id = "ds=nocloud"
+        pairs = (
+            ("root=/dev/sda1 %(ds_id)s", {}),
+            ("%(ds_id)s; root=/dev/foo", {}),
+            ("%(ds_id)s", {}),
+            ("%(ds_id)s;", {}),
+            ("%(ds_id)s;s=SEED", {'seedfrom': 'SEED'}),
+            ("%(ds_id)s;seedfrom=SEED;local-hostname=xhost",
+             {'seedfrom': 'SEED', 'local-hostname': 'xhost'}),
+            ("%(ds_id)s;h=xhost",
+             {'local-hostname': 'xhost'}),
+            ("%(ds_id)s;h=xhost;i=IID",
+             {'local-hostname': 'xhost', 'instance-id': 'IID'}),
+        )
+
+        for (fmt, expected) in pairs:
+            fill = {}
+            cmdline = fmt % {'ds_id': ds_id}
+            ret = parse(ds_id=ds_id, fill=fill, cmdline=cmdline)
+            self.assertEqual(expected, fill)
+            self.assertTrue(ret)
+
+    def test_parse_cmdline_data_none(self):
+        parse = DataSourceNoCloud.parse_cmdline_data
+
+        ds_id = "ds=foo"
+        cmdlines = (
+            "root=/dev/sda1 ro",
+            "console=/dev/ttyS0 root=/dev/foo",
+            "",
+            "ds=foocloud",
+            "ds=foo-net",
+            "ds=nocloud;s=SEED",
+        )
+
+        for cmdline in cmdlines:
+            fill = {}
+            ret = parse(ds_id=ds_id, fill=fill, cmdline=cmdline)
+            self.assertEqual(fill, {})
+            self.assertFalse(ret)
+
+
+# vi: ts=4 expandtab