diff options
| author | Tang Chen <tangchen@cn.fujitsu.com> | 2015-11-28 14:05:20 +0800 |
|---|---|---|
| committer | Tang Chen <tangchen@cn.fujitsu.com> | 2015-11-28 14:05:20 +0800 |
| commit | f9ca752177dbce93dc2bc4944905b9057e50e814 (patch) | |
| tree | 94935620e4c44bb19b28a462d8cf9f0b36dcb712 /openstackclient/tests | |
| parent | 8d523266fcfc1c71734f22ec0ae4d5707097dfc8 (diff) | |
| download | python-openstackclient-f9ca752177dbce93dc2bc4944905b9057e50e814.tar.gz | |
Refactor: Abstract columns out in TestFlavorList to avoid redundant code.
The columns has been set in each test case of TestFlavorList, which is not
necessary. This patch abstract it out and remove all redundant code.
Change-Id: Ideb2872f073755ac251bd603fd906410ea86c4ef
Implements: blueprint improve-flavor-unit-tes
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 73 |
1 files changed, 20 insertions, 53 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index 523104f0..3028a313 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -47,6 +47,21 @@ class TestFlavor(compute_fakes.TestComputev2): class TestFlavorList(TestFlavor): + columns = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + ) + columns_long = columns + ( + 'Swap', + 'RXTX Factor', + 'Properties' + ) + def setUp(self): super(TestFlavorList, self).setUp() @@ -85,16 +100,7 @@ class TestFlavorList(TestFlavor): **kwargs ) - collist = ( - 'ID', - 'Name', - 'RAM', - 'Disk', - 'Ephemeral', - 'VCPUs', - 'Is Public', - ) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = (( compute_fakes.flavor_id, compute_fakes.flavor_name, @@ -130,16 +136,7 @@ class TestFlavorList(TestFlavor): **kwargs ) - collist = ( - 'ID', - 'Name', - 'RAM', - 'Disk', - 'Ephemeral', - 'VCPUs', - 'Is Public', - ) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = (( compute_fakes.flavor_id, compute_fakes.flavor_name, @@ -175,16 +172,7 @@ class TestFlavorList(TestFlavor): **kwargs ) - collist = ( - 'ID', - 'Name', - 'RAM', - 'Disk', - 'Ephemeral', - 'VCPUs', - 'Is Public', - ) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = (( compute_fakes.flavor_id, compute_fakes.flavor_name, @@ -220,16 +208,7 @@ class TestFlavorList(TestFlavor): **kwargs ) - collist = ( - 'ID', - 'Name', - 'RAM', - 'Disk', - 'Ephemeral', - 'VCPUs', - 'Is Public', - ) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = (( compute_fakes.flavor_id, compute_fakes.flavor_name, @@ -265,19 +244,7 @@ class TestFlavorList(TestFlavor): **kwargs ) - collist = ( - 'ID', - 'Name', - 'RAM', - 'Disk', - 'Ephemeral', - 'VCPUs', - 'Is Public', - 'Swap', - 'RXTX Factor', - 'Properties' - ) - self.assertEqual(collist, columns) + self.assertEqual(self.columns_long, columns) datalist = (( compute_fakes.flavor_id, compute_fakes.flavor_name, |