Merge lp:~veebers/autopilot/fix-config-contains-equals into lp:autopilot

[Christopher Lee]

Command line test config values can now contain the '=' character.

Command line test config values can now contain the '=' character.

[Leo Arias (elopio)]

I like the new tests, and they all pass. Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'autopilot/_config.py'
--- autopilot/_config.py	2014-05-21 07:42:24 +0000
+++ autopilot/_config.py	2015-01-25 21:35:22 +0000
@@ -71,14 +71,14 @@
 
     def __init__(self, config_string):
         self._data = {}
-        for item in config_string.split(','):
-            if not item:
-                continue
-            parts = item.split('=')
-            if len(parts) == 1:
-                self._data[parts[0].lstrip()] = '1'
-            elif len(parts) == 2:
-                self._data[parts[0].lstrip()] = parts[1]
+        config_items = (item for item in config_string.split(',') if item)
+        for item in config_items:
+            parts = item.split('=', 1)
+            safe_key = parts[0].lstrip()
+            if len(parts) == 1 and safe_key != '':
+                self._data[safe_key] = '1'
+            elif len(parts) == 2 and safe_key != '':
+                self._data[safe_key] = parts[1]
             else:
                 raise ValueError(
                     "Invalid configuration string '{}'".format(config_string)

=== modified file 'autopilot/tests/unit/test_config.py'
--- autopilot/tests/unit/test_config.py	2014-05-23 11:28:21 +0000
+++ autopilot/tests/unit/test_config.py	2015-01-25 21:35:22 +0000
@@ -51,6 +51,10 @@
         d = config.ConfigDict('foo')
         self.assertEqual(d['foo'], '1')
 
+    def test_single_value_containing_equals_symbol(self):
+        d = config.ConfigDict('foo=b=a')
+        self.assertEqual(d['foo'], 'b=a')
+
     def test_multiple_simple_keys(self):
         d = config.ConfigDict('foo,bar')
         self.assertTrue('foo' in d)
@@ -87,8 +91,14 @@
         d = config.ConfigDict(' foo=bar, bar=baz')
         self.assertEqual(set(d.keys()), {'foo', 'bar'})
 
+    def test_raises_ValueError_on_blank_key(self):
+        self.assertRaises(ValueError, lambda: config.ConfigDict('=,'))
+
+    def test_raises_ValueError_on_space_key(self):
+        self.assertRaises(ValueError, lambda: config.ConfigDict(' =,'))
+
     def test_raises_ValueError_on_invalid_string(self):
-        self.assertRaises(ValueError, lambda: config.ConfigDict('f=b=c'))
+        self.assertRaises(ValueError, lambda: config.ConfigDict('f,='))
 
     def test_iter(self):
         k = config.ConfigDict('foo').keys()