fix the wrong order of assertEqual args

Let's fix them thoroughly.

Change-Id: I8a1f042fb614b05c9836a49041f3883638b870b0

6 files changed, 60 insertions, 60 deletions

diff --git a/openstackclient/tests/identity/v2_0/test_endpoint.py b/openstackclient/tests/identity/v2_0/test_endpoint.py
index 0d7db0aa..354b1e40 100644
--- a/openstackclient/tests/identity/v2_0/test_endpoint.py
+++ b/openstackclient/tests/identity/v2_0/test_endpoint.py
@@ -84,7 +84,7 @@ class TestEndpointCreate(TestEndpoint):
 
         collist = ('adminurl', 'id', 'internalurl', 'publicurl',
                    'region', 'service_id', 'service_name', 'service_type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.endpoint_adminurl,
             identity_fakes.endpoint_id,
@@ -96,7 +96,7 @@ class TestEndpointCreate(TestEndpoint):
             identity_fakes.service_type,
         )
 
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestEndpointDelete(TestEndpoint):
@@ -171,14 +171,14 @@ class TestEndpointList(TestEndpoint):
         self.endpoints_mock.list.assert_called_with()
 
         collist = ('ID', 'Region', 'Service Name', 'Service Type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.endpoint_id,
             identity_fakes.endpoint_region,
             identity_fakes.service_name,
             identity_fakes.service_type,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_endpoint_list_long(self):
         arglist = [
@@ -196,7 +196,7 @@ class TestEndpointList(TestEndpoint):
 
         collist = ('ID', 'Region', 'Service Name', 'Service Type',
                    'PublicURL', 'AdminURL', 'InternalURL')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.endpoint_id,
             identity_fakes.endpoint_region,
@@ -206,7 +206,7 @@ class TestEndpointList(TestEndpoint):
             identity_fakes.endpoint_adminurl,
             identity_fakes.endpoint_internalurl,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestEndpointShow(TestEndpoint):
@@ -252,7 +252,7 @@ class TestEndpointShow(TestEndpoint):
 
         collist = ('adminurl', 'id', 'internalurl', 'publicurl',
                    'region', 'service_id', 'service_name', 'service_type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.endpoint_adminurl,
             identity_fakes.endpoint_id,
@@ -263,4 +263,4 @@ class TestEndpointShow(TestEndpoint):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v2_0/test_project.py b/openstackclient/tests/identity/v2_0/test_project.py
index 0c5ef77f..18e862eb 100644
--- a/openstackclient/tests/identity/v2_0/test_project.py
+++ b/openstackclient/tests/identity/v2_0/test_project.py
@@ -71,14 +71,14 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_description(self):
         arglist = [
@@ -105,14 +105,14 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_enable(self):
         arglist = [
@@ -140,14 +140,14 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_disable(self):
         arglist = [
@@ -175,14 +175,14 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_property(self):
         arglist = [
@@ -212,14 +212,14 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -331,7 +331,7 @@ class TestProjectDelete(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         self.projects_mock.delete.assert_called_with(
             identity_fakes.project_id,
@@ -364,12 +364,12 @@ class TestProjectList(TestProject):
         self.projects_mock.list.assert_called_with()
 
         collist = ('ID', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.project_id,
             identity_fakes.project_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_project_list_long(self):
         arglist = [
@@ -385,14 +385,14 @@ class TestProjectList(TestProject):
         self.projects_mock.list.assert_called_with()
 
         collist = ('ID', 'Name', 'Description', 'Enabled')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.project_id,
             identity_fakes.project_name,
             identity_fakes.project_description,
             True,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestProjectSet(TestProject):
@@ -426,7 +426,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
     def test_project_set_name(self):
         arglist = [
@@ -442,7 +442,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         # Set expected values
         kwargs = {
@@ -469,7 +469,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         # Set expected values
         kwargs = {
@@ -495,7 +495,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         # Set expected values
         kwargs = {
@@ -521,7 +521,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         # Set expected values
         kwargs = {
@@ -547,7 +547,7 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         # Set expected values
         kwargs = {
@@ -593,11 +593,11 @@ class TestProjectShow(TestProject):
         )
 
         collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             True,
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index 2e3a2863..478a4ff2 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -97,12 +97,12 @@ class TestRoleAdd(TestRole):
         )
 
         collist = ('id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.role_id,
             identity_fakes.role_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestRoleCreate(TestRole):
@@ -137,12 +137,12 @@ class TestRoleCreate(TestRole):
         )
 
         collist = ('id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.role_id,
             identity_fakes.role_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_role_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -273,12 +273,12 @@ class TestRoleList(TestRole):
         self.roles_mock.list.assert_called_with()
 
         collist = ('ID', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestUserRoleList(TestRole):
@@ -339,14 +339,14 @@ class TestUserRoleList(TestRole):
         )
 
         collist = ('ID', 'Name', 'Project', 'User')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
             identity_fakes.project_name,
             identity_fakes.user_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_user_role_list_project(self):
         self.projects_mock.get.return_value = fakes.FakeResource(
@@ -396,14 +396,14 @@ class TestUserRoleList(TestRole):
         )
 
         collist = ('ID', 'Name', 'Project', 'User')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
             identity_fakes.PROJECT_2['name'],
             identity_fakes.user_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestRoleRemove(TestRole):
@@ -489,9 +489,9 @@ class TestRoleShow(TestRole):
         )
 
         collist = ('id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.role_id,
             identity_fakes.role_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v2_0/test_service.py b/openstackclient/tests/identity/v2_0/test_service.py
index 73606585..26a9716f 100644
--- a/openstackclient/tests/identity/v2_0/test_service.py
+++ b/openstackclient/tests/identity/v2_0/test_service.py
@@ -67,14 +67,14 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_with_type_option(self):
         arglist = [
@@ -100,14 +100,14 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_with_name_option(self):
         arglist = [
@@ -133,14 +133,14 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_description(self):
         arglist = [
@@ -167,14 +167,14 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestServiceDelete(TestService):
@@ -236,13 +236,13 @@ class TestServiceList(TestService):
         self.services_mock.list.assert_called_with()
 
         collist = ('ID', 'Name', 'Type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_service_list_long(self):
         arglist = [
@@ -259,14 +259,14 @@ class TestServiceList(TestService):
         self.services_mock.list.assert_called_with()
 
         collist = ('ID', 'Name', 'Type', 'Description')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
             identity_fakes.service_description,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestServiceShow(TestService):
@@ -301,11 +301,11 @@ class TestServiceShow(TestService):
         )
 
         collist = ('description', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             identity_fakes.service_id,
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v2_0/test_token.py b/openstackclient/tests/identity/v2_0/test_token.py
index 4184326c..ce2faef3 100644
--- a/openstackclient/tests/identity/v2_0/test_token.py
+++ b/openstackclient/tests/identity/v2_0/test_token.py
@@ -49,14 +49,14 @@ class TestTokenIssue(TestToken):
         self.sc_mock.get_token.assert_called_with()
 
         collist = ('expires', 'id', 'project_id', 'user_id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.token_expires,
             identity_fakes.token_id,
             identity_fakes.project_id,
             identity_fakes.user_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestTokenRevoke(TestToken):
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py
index ccdf240e..6fe82f93 100644
--- a/openstackclient/tests/identity/v2_0/test_user.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -586,7 +586,7 @@ class TestUserSet(TestUser):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
     def test_user_set_name(self):
         arglist = [