From f19ff68e59e0fde9f46379dd225bf4d715d2d413 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Sat, 28 Nov 2015 14:26:09 +0800
Subject: [PATCH] Refactor: Abstract datalist out in TestFlavorList to avoid
 redundant code.

datalist has been set in each test case in TestFlavorList, which is not
necessary. This patch abstract it out and remove all redundant code.

Change-Id: I6f735f7d9fa29a8ab435adaef17ca559df1fdcee
Implements: blueprint improve-flavor-unit-test
---
 .../tests/compute/v2/test_flavor.py           | 73 +++++--------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 3028a31352..6cb754f784 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -62,6 +62,21 @@ class TestFlavorList(TestFlavor):
         'Properties'
     )
 
+    data = ((
+        compute_fakes.flavor_id,
+        compute_fakes.flavor_name,
+        compute_fakes.flavor_ram,
+        '',
+        '',
+        compute_fakes.flavor_vcpus,
+        ''
+    ), )
+    data_long = (data[0] + (
+        '',
+        '',
+        'property=\'value\''
+    ), )
+
     def setUp(self):
         super(TestFlavorList, self).setUp()
 
@@ -101,16 +116,7 @@ class TestFlavorList(TestFlavor):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            compute_fakes.flavor_id,
-            compute_fakes.flavor_name,
-            compute_fakes.flavor_ram,
-            '',
-            '',
-            compute_fakes.flavor_vcpus,
-            ''
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(tuple(self.data), tuple(data))
 
     def test_flavor_list_all_flavors(self):
         arglist = [
@@ -137,16 +143,7 @@ class TestFlavorList(TestFlavor):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            compute_fakes.flavor_id,
-            compute_fakes.flavor_name,
-            compute_fakes.flavor_ram,
-            '',
-            '',
-            compute_fakes.flavor_vcpus,
-            ''
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(tuple(self.data), tuple(data))
 
     def test_flavor_list_private_flavors(self):
         arglist = [
@@ -173,16 +170,7 @@ class TestFlavorList(TestFlavor):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            compute_fakes.flavor_id,
-            compute_fakes.flavor_name,
-            compute_fakes.flavor_ram,
-            '',
-            '',
-            compute_fakes.flavor_vcpus,
-            ''
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(tuple(self.data), tuple(data))
 
     def test_flavor_list_public_flavors(self):
         arglist = [
@@ -209,16 +197,7 @@ class TestFlavorList(TestFlavor):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            compute_fakes.flavor_id,
-            compute_fakes.flavor_name,
-            compute_fakes.flavor_ram,
-            '',
-            '',
-            compute_fakes.flavor_vcpus,
-            ''
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(tuple(self.data), tuple(data))
 
     def test_flavor_list_long(self):
         arglist = [
@@ -245,19 +224,7 @@ class TestFlavorList(TestFlavor):
         )
 
         self.assertEqual(self.columns_long, columns)
-        datalist = ((
-            compute_fakes.flavor_id,
-            compute_fakes.flavor_name,
-            compute_fakes.flavor_ram,
-            '',
-            '',
-            compute_fakes.flavor_vcpus,
-            '',
-            '',
-            '',
-            'property=\'value\''
-        ), )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(tuple(self.data_long), tuple(data))
 
 
 class TestFlavorSet(TestFlavor):