From 904377462f58464937d4cafeb8c432f024a85bd4 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 14 Oct 2018 12:08:03 +0200 Subject: Fix image properties parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It removes useless spaces and now conforms with oslo.conf dict. New helpers and unit tests are available. Change-Id: I20335c5e5c3840cc872e158c6072d97a3f2cb98c Signed-off-by: Cédric Ollivier --- .../unit/openstack/tempest/test_conf_utils.py | 20 ----------- functest/tests/unit/utils/test_functest_utils.py | 41 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 20 deletions(-) (limited to 'functest/tests/unit') diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index 316f21be2..19b07ba3e 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -158,26 +158,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase): ['rally', 'verify', 'configure-verifier', '--reconfigure', '--id', str(getattr(config.CONF, 'tempest_verifier_name'))]) - def test_convert_dict_to_ini(self): - self.assertEqual( - conf_utils.convert_dict_to_ini({}), "") - self.assertEqual( - conf_utils.convert_dict_to_ini({"a": "b"}), "a:b") - value = conf_utils.convert_dict_to_ini({"a": "b", "c": "d"}) - self.assertTrue(value == "a:b,c:d" or value == "c:d,a:b") - with self.assertRaises(AssertionError): - conf_utils.convert_list_to_ini("") - - def test_convert_list_to_ini(self): - self.assertEqual( - conf_utils.convert_list_to_ini([]), "") - self.assertEqual( - conf_utils.convert_list_to_ini(["a"]), "a") - self.assertEqual( - conf_utils.convert_list_to_ini(["a", "b"]), "a,b") - with self.assertRaises(AssertionError): - conf_utils.convert_list_to_ini("") - if __name__ == "__main__": logging.disable(logging.CRITICAL) diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py index ab90de595..0562e3bf6 100644 --- a/functest/tests/unit/utils/test_functest_utils.py +++ b/functest/tests/unit/utils/test_functest_utils.py @@ -338,6 +338,47 @@ class FunctestUtilsTesting(unittest.TestCase): functest_utils.get_openstack_version(cloud), "Unknown") args[0].assert_called_once_with(cloud) + def test_convert_dict_to_ini(self): + self.assertEqual( + functest_utils.convert_dict_to_ini({}), "") + self.assertEqual( + functest_utils.convert_dict_to_ini({"a": "b"}), "a:b") + value = functest_utils.convert_dict_to_ini({"a": "b", "c": "d"}) + self.assertTrue(value == "a:b,c:d" or value == "c:d,a:b") + with self.assertRaises(AssertionError): + functest_utils.convert_list_to_ini("") + + def test_convert_list_to_ini(self): + self.assertEqual( + functest_utils.convert_list_to_ini([]), "") + self.assertEqual( + functest_utils.convert_list_to_ini(["a"]), "a") + self.assertEqual( + functest_utils.convert_list_to_ini(["a", "b"]), "a,b") + with self.assertRaises(AssertionError): + functest_utils.convert_list_to_ini("") + + def test_convert_ini_to_dict(self): + self.assertEqual( + functest_utils.convert_ini_to_dict(""), {}) + self.assertEqual( + functest_utils.convert_ini_to_dict("a:b"), {"a": "b"}) + self.assertEqual( + functest_utils.convert_ini_to_dict( + "a:b,c:d"), {"a": "b", "c": "d"}) + with self.assertRaises(AssertionError): + functest_utils.convert_list_to_ini({}) + + def test_convert_ini_to_list(self): + self.assertEqual( + functest_utils.convert_ini_to_list(""), []) + self.assertEqual( + functest_utils.convert_ini_to_list("a"), ["a"]) + self.assertEqual( + functest_utils.convert_ini_to_list("a,b"), ["a", "b"]) + with self.assertRaises(AssertionError): + functest_utils.convert_ini_to_list([]) + if __name__ == "__main__": logging.disable(logging.CRITICAL) -- cgit 1.2.3-korg