Merge "assertEquals order wrong"

Jenkins · openstack-gerrit · commit d3502b62d665 · 2014-09-07T05:14:07.000Z
diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py
@@ -101,7 +101,7 @@ def test_volume_create_min_options(self):
             'status',
             'type',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             'detached',
             volume_fakes.volume_zone,
@@ -113,7 +113,7 @@ def test_volume_create_min_options(self):
             '',
             volume_fakes.volume_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_volume_create_options(self):
         arglist = [
@@ -165,7 +165,7 @@ def test_volume_create_options(self):
             'status',
             'type',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             'detached',
             volume_fakes.volume_zone,
@@ -177,7 +177,7 @@ def test_volume_create_options(self):
             '',
             volume_fakes.volume_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_volume_create_user_project_id(self):
         # Return a project
@@ -240,7 +240,7 @@ def test_volume_create_user_project_id(self):
             'status',
             'type',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             'detached',
             volume_fakes.volume_zone,
@@ -252,7 +252,7 @@ def test_volume_create_user_project_id(self):
             '',
             volume_fakes.volume_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_volume_create_user_project_name(self):
         # Return a project
@@ -315,7 +315,7 @@ def test_volume_create_user_project_name(self):
             'status',
             'type',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             'detached',
             volume_fakes.volume_zone,
@@ -327,7 +327,7 @@ def test_volume_create_user_project_name(self):
             '',
             volume_fakes.volume_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_volume_create_properties(self):
         arglist = [
@@ -376,7 +376,7 @@ def test_volume_create_properties(self):
             'status',
             'type',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             'detached',
             volume_fakes.volume_zone,
@@ -388,4 +388,4 @@ def test_volume_create_properties(self):
             '',
             volume_fakes.volume_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
