Merge lp:~abentley/ci-director/allow-colon into lp:ci-director

[Aaron Bentley]

Allow colons in ci-director config values.

Colons in ci-director config values break our scripts.

The problem is that the output of split(':') is fed into a two-value tuple, so when there is more than one ":", we get a ValueError: too many values to unpack.

This branch changes it so that we do split(':', 1). The first colon is treated as a separator, and the rest become part of the value.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'cidirector/cidirector.py'
--- cidirector/cidirector.py	2017-01-16 16:58:05 +0000
+++ cidirector/cidirector.py	2017-01-23 15:45:52 +0000
@@ -404,7 +404,7 @@
             if not found_stanza and '[{}]'.format(section) == line.strip():
                 found_stanza = True
             if found_stanza and ':' in line:
-                key, value = line.split(':')
+                key, value = line.split(':', 1)
                 key = key.strip().lower().replace('-', '_')
                 if key in options:
                     value = value.strip().lower()

=== modified file 'cidirector/tests/test_cidirector.py'
--- cidirector/tests/test_cidirector.py	2017-01-16 16:58:05 +0000
+++ cidirector/tests/test_cidirector.py	2017-01-23 15:45:52 +0000
@@ -2001,6 +2001,16 @@
                          {'supported_substrates': ['foo', 'bar', 'baz']},
                          )
 
+    def test_config_from_description_colon(self):
+        config = ResourcefulJob.config_from_description(
+            'id', dedent("""\
+                [ci-director]
+                group-name: foo:bar
+                """), logging.getLogger())
+        self.assertEqual(
+            config,
+            {'group_name': 'foo:bar'})
+
     def test_get_job_from_jenkins(self):
         server_info = make_server_info(
             'idle', buildable=['foo'], building=['build-revision'],