summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-07 05:14:07 +0000
committerGerrit Code Review <review@openstack.org>2014-09-07 05:14:07 +0000
commitd3502b62d665caa8c8eb59ee0eb017f130c7b8a2 (patch)
treef745dd6c6082c852b53642d2e702a0c6449b9c45 /openstackclient/tests
parentdc9ce6d6081867137c91cee235bceaf35906bc87 (diff)
parentdc68d3f5cfb2df1008bfb342984bd7fe1298f917 (diff)
downloadpython-openstackclient-d3502b62d665caa8c8eb59ee0eb017f130c7b8a2.tar.gz
Merge "assertEquals order wrong"
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/volume/v1/test_volume.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py
index cb006b10..f020791a 100644
--- a/openstackclient/tests/volume/v1/test_volume.py
+++ b/openstackclient/tests/volume/v1/test_volume.py
@@ -101,7 +101,7 @@ class TestVolumeCreate(TestVolume):
'status',
'type',
)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
'detached',
volume_fakes.volume_zone,
@@ -113,7 +113,7 @@ class TestVolumeCreate(TestVolume):
'',
volume_fakes.volume_type,
)
- self.assertEqual(data, datalist)
+ self.assertEqual(datalist, data)
def test_volume_create_options(self):
arglist = [
@@ -165,7 +165,7 @@ class TestVolumeCreate(TestVolume):
'status',
'type',
)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
'detached',
volume_fakes.volume_zone,
@@ -177,7 +177,7 @@ class TestVolumeCreate(TestVolume):
'',
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 @@ class TestVolumeCreate(TestVolume):
'status',
'type',
)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
'detached',
volume_fakes.volume_zone,
@@ -252,7 +252,7 @@ class TestVolumeCreate(TestVolume):
'',
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 @@ class TestVolumeCreate(TestVolume):
'status',
'type',
)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
'detached',
volume_fakes.volume_zone,
@@ -327,7 +327,7 @@ class TestVolumeCreate(TestVolume):
'',
volume_fakes.volume_type,
)
- self.assertEqual(data, datalist)
+ self.assertEqual(datalist, data)
def test_volume_create_properties(self):
arglist = [
@@ -376,7 +376,7 @@ class TestVolumeCreate(TestVolume):
'status',
'type',
)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
'detached',
volume_fakes.volume_zone,
@@ -388,4 +388,4 @@ class TestVolumeCreate(TestVolume):
'',
volume_fakes.volume_type,
)
- self.assertEqual(data, datalist)
+ self.assertEqual(datalist, data)