Fix error when keywords are defined as a list in cfg

When keywords are defined as a list in cfg file the generated
output have errors and breaks metadata generation.

Change-Id: Ie8a5f30d6af1e81ecf3ca40bc94bc460cca38179
Closes-Bug: #1811475

2 files changed, 31 insertions, 1 deletions

diff --git a/pbr/tests/test_core.py b/pbr/tests/test_core.py
index 0ee6f53..ccd14ab 100644
--- a/pbr/tests/test_core.py
+++ b/pbr/tests/test_core.py
@@ -74,7 +74,7 @@ class TestCore(base.BaseTestCase):
 
         self.run_setup('egg_info')
         stdout, _, _ = self.run_setup('--keywords')
-        assert stdout == 'packaging,distutils,setuptools'
+        assert stdout == 'packaging, distutils, setuptools'
 
     def test_setup_py_build_sphinx(self):
         stdout, _, return_code = self.run_setup('build_sphinx')
diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py
index 6c490a9..8370bf1 100644
--- a/pbr/tests/test_util.py
+++ b/pbr/tests/test_util.py
@@ -130,3 +130,33 @@ class TestMapFieldsParsingScenarios(base.BaseTestCase):
         kwargs = util.setup_cfg_to_setup_kwargs(config)
 
         self.assertEqual(self.expected_project_urls, kwargs['project_urls'])
+
+
+class TestKeywordsParsingScenarios(base.BaseTestCase):
+
+    scenarios = [
+        ('keywords_list', {
+            'config_text': """
+                [metadata]
+                keywords =
+                    one
+                    two
+                    three
+                """,  # noqa: E501
+            'expected_keywords': ['one', 'two', 'three'],
+            },
+        ),
+        ('inline_keywords', {
+            'config_text': """
+                [metadata]
+                keywords = one, two, three
+                """,  # noqa: E501
+            'expected_keywords': ['one, two, three'],
+        }),
+    ]
+
+    def test_keywords_parsing(self):
+        config = config_from_ini(self.config_text)
+        kwargs = util.setup_cfg_to_setup_kwargs(config)
+
+        self.assertEqual(self.expected_keywords, kwargs['keywords'])