Raises error if duplicate keys found in DictOpt

DictOpt didn't report when the input values had duplicate keys.
This would be a problem if the user had put in duplicate keys in
the conf file and the service didn't work as expected.
(c.f) Neutrons provider network mapping options
This patch raises a ConfigFileValueError when duplicate keys are found.

Fixes bug #1228995

Change-Id: I91e1bd0eda4ed4fd6c7eb6ea5d4a89d583d1305e

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/test_cfg.py b/tests/test_cfg.py
index 8d939ca..3f2fafc 100644
--- a/tests/test_cfg.py
+++ b/tests/test_cfg.py
@@ -1022,6 +1022,30 @@ class ConfigFileOptsTestCase(BaseTestCase):
         self.assertTrue(hasattr(self.conf, 'foo'))
         self.assertEqual(self.conf.foo, {'key': 'bar:baz'})
 
+    def test_conf_file_dict_value_no_colon(self):
+        self.conf.register_opt(cfg.DictOpt('foo'))
+
+        paths = self.create_tempfiles([('test',
+                                        '[DEFAULT]\n'
+                                        'foo = key:bar,baz\n')])
+
+        self.conf(['--config-file', paths[0]])
+
+        self.assertRaises(cfg.ConfigFileValueError, self.conf._get, 'foo')
+        self.assertRaises(AttributeError, getattr, self.conf, 'foo')
+
+    def test_conf_file_dict_value_duplicate_key(self):
+        self.conf.register_opt(cfg.DictOpt('foo'))
+
+        paths = self.create_tempfiles([('test',
+                                        '[DEFAULT]\n'
+                                        'foo = key:bar,key:baz\n')])
+
+        self.conf(['--config-file', paths[0]])
+
+        self.assertRaises(cfg.ConfigFileValueError, self.conf._get, 'foo')
+        self.assertRaises(AttributeError, getattr, self.conf, 'foo')
+
     def test_conf_file_dict_values_override_deprecated(self):
         self.conf.register_cli_opt(cfg.DictOpt('foo',
                                    deprecated_name='oldfoo'))