From 3258664c7a2ab7a4fda3ed5e46ec4768ca6c56e8 Mon Sep 17 00:00:00 2001 From: "zhiyong.dai" Date: Sun, 27 Nov 2016 21:07:34 +0800 Subject: [PATCH] Refactor module functional test Combine "test_module_list_no_options" and "test_module_list_with_all_option" into one test, and modify the test for "--all' option. Change-Id: If4e7a73502a888c50de17ec19ef7e8d02dd23f1d --- .../tests/functional/common/test_module.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openstackclient/tests/functional/common/test_module.py b/openstackclient/tests/functional/common/test_module.py index f56c1627bb..b56c83ad24 100644 --- a/openstackclient/tests/functional/common/test_module.py +++ b/openstackclient/tests/functional/common/test_module.py @@ -29,12 +29,15 @@ class ModuleTest(base.TestCase): 'os_client_config', 'keystoneauth1'] - def test_module_list_no_options(self): - json_output = json.loads(self.openstack('module list -f json')) + def test_module_list(self): + # Test module list + cmd_output = json.loads(self.openstack('module list -f json')) for one_module in self.CLIENTS: - self.assertIn(one_module, json_output.keys()) + self.assertIn(one_module, cmd_output.keys()) + for one_module in self.LIBS: + self.assertNotIn(one_module, cmd_output.keys()) - def test_module_list_with_all_option(self): - json_output = json.loads(self.openstack('module list --all -f json')) - for one_module in (self.CLIENTS + self.LIBS): - self.assertIn(one_module, json_output.keys()) + # Test module list --all + cmd_output = json.loads(self.openstack('module list --all -f json')) + for one_module in self.CLIENTS + self.LIBS: + self.assertIn(one_module, cmd_output.keys())