3 files changed, 22 insertions, 11 deletions
diff --git a/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py b/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
index 61b87de2a..b1ed4cb2b 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
@@ -182,7 +182,8 @@ class TestImportComponentOptions(OptionTestCase):
     """test cases for component loading."""
 
     def setUp(self):
-        self.options = [Option("--cls", action=ImportComponentAction),
+        self.options = [Option("--cls", cf=("config", "cls"),
+                               action=ImportComponentAction),
                         Option("--module", action=ImportModuleAction)]
 
         self.result = argparse.Namespace()
@@ -227,3 +228,10 @@ class TestImportComponentOptions(OptionTestCase):
         self.assertRaises(SystemExit,
                           self.parser.parse,
                           ["-C", config_file, "--cls", "Bcfg2.No.Such.Thing"])
+
+    @make_config({"config": {"test": "foo", "cls": "Two"}})
+    def test_default_from_config_for_component_options(self, config_file):
+        """use default value from config file for options added by dynamic loaded component."""
+        self.parser.parse(["-C", config_file])
+        self.assertEqual(self.result.cls, Two.Two)
+        self.assertEqual(self.result.test, "foo")
diff --git a/testsuite/Testsrc/Testlib/TestOptions/TestTypes.py b/testsuite/Testsrc/Testlib/TestOptions/TestTypes.py
index 404d67fdc..0b67db38a 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/TestTypes.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/TestTypes.py
@@ -46,21 +46,23 @@ class TestOptionTypes(Bcfg2TestCase):
         self.assertItemsEqual(self._test_options(["--test", "one:two three"]),
                               ["one", "two three"])
 
-    def test_comma_dict(self):
-        """parse comma-dict values."""
-        self.options = [Option("--test", type=Types.comma_dict)]
+    def test_literal_dict(self):
+        """parse literal-dict values."""
+        self.options = [Option("--test", type=Types.literal_dict)]
         expected = {
             "one": True,
             "two": 2,
             "three": "three",
-            "four": False}
+            "four": False,
+            "five": {
+                "a": 1,
+                "b": 2
+        }}
         self.assertDictEqual(
             self._test_options(["--test",
-                                "one=yes, two=2  , three=three,four=no"]),
-            expected)
-
-        self.assertDictEqual(
-            self._test_options(["--test", "one,two=2,three=three,four=off"]),
+                                '''{ "one": True, "two": 2,
+                                     "three": "three", "four": False,
+                                     "five": { "a": 1, "b": 2 }}''']),
             expected)
 
     def test_anchored_regex_list(self):
diff --git a/testsuite/Testsrc/Testlib/TestOptions/Two.py b/testsuite/Testsrc/Testlib/TestOptions/Two.py
index 189e0817f..0120e8b77 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/Two.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/Two.py
@@ -1,6 +1,7 @@
 """Test module for component loading."""
+from Bcfg2.Options import Option
 
 
 class Two(object):
     """Test class for component loading."""
-    pass
+    options = [Option('--test', cf=("config", "test"), dest="test", default="bar")]