fix the wrong order of assertEqual args

Let's fix them thoroughly.

Change-Id: I8a1f042fb614b05c9836a49041f3883638b870b0

12 files changed, 153 insertions, 153 deletions

diff --git a/openstackclient/tests/identity/v3/test_consumer.py b/openstackclient/tests/identity/v3/test_consumer.py
index dd2f3327..4e807562 100644
--- a/openstackclient/tests/identity/v3/test_consumer.py
+++ b/openstackclient/tests/identity/v3/test_consumer.py
@@ -54,13 +54,13 @@ class TestConsumerCreate(TestOAuth1):
         )
 
         collist = ('description', 'id', 'secret')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.consumer_description,
             identity_fakes.consumer_id,
             identity_fakes.consumer_secret,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestConsumerDelete(TestOAuth1):
@@ -88,7 +88,7 @@ class TestConsumerDelete(TestOAuth1):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         self.consumers_mock.delete.assert_called_with(
             identity_fakes.consumer_id,
@@ -126,12 +126,12 @@ class TestConsumerList(TestOAuth1):
         self.consumers_mock.list.assert_called_with()
 
         collist = ('ID', 'Description')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.consumer_id,
             identity_fakes.consumer_description,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestConsumerShow(TestOAuth1):
@@ -165,12 +165,12 @@ class TestConsumerShow(TestOAuth1):
         )
 
         collist = ('description', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.consumer_description,
             identity_fakes.consumer_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestConsumerSet(TestOAuth1):
@@ -207,7 +207,7 @@ class TestConsumerSet(TestOAuth1):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         kwargs = {'description': new_description}
         self.consumers_mock.update.assert_called_with(
diff --git a/openstackclient/tests/identity/v3/test_group.py b/openstackclient/tests/identity/v3/test_group.py
index dce56362..6766a081 100644
--- a/openstackclient/tests/identity/v3/test_group.py
+++ b/openstackclient/tests/identity/v3/test_group.py
@@ -88,7 +88,7 @@ class TestGroupList(TestGroup):
         )
 
         collist = ('ID', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.group_id,
             identity_fakes.group_name,
@@ -118,7 +118,7 @@ class TestGroupList(TestGroup):
         )
 
         collist = ('ID', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.group_id,
             identity_fakes.group_name,
@@ -148,7 +148,7 @@ class TestGroupList(TestGroup):
         )
 
         collist = ('ID', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.group_id,
             identity_fakes.group_name,
@@ -183,7 +183,7 @@ class TestGroupList(TestGroup):
             'Domain ID',
             'Description',
         )
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.group_id,
             identity_fakes.group_name,
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index c74bce8e..527f01b5 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -61,13 +61,13 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         )
 
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.idp_description,
             True,
             identity_fakes.idp_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_create_identity_provider_description(self):
         arglist = [
@@ -93,13 +93,13 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         )
 
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.idp_description,
             True,
             identity_fakes.idp_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_create_identity_provider_disabled(self):
 
@@ -133,13 +133,13 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         )
 
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             None,
             False,
             identity_fakes.idp_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestIdentityProviderDelete(TestIdentityProvider):
@@ -203,13 +203,13 @@ class TestIdentityProviderList(TestIdentityProvider):
         self.identity_providers_mock.list.assert_called_with()
 
         collist = ('ID', 'Enabled', 'Description')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.idp_id,
             True,
             identity_fakes.idp_description,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestIdentityProviderShow(TestIdentityProvider):
@@ -242,13 +242,13 @@ class TestIdentityProviderShow(TestIdentityProvider):
         )
 
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.idp_description,
             True,
             identity_fakes.idp_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestIdentityProviderSet(TestIdentityProvider):
@@ -291,7 +291,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
         )
 
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.idp_description,
             False,
@@ -328,13 +328,13 @@ class TestIdentityProviderSet(TestIdentityProvider):
         self.identity_providers_mock.update.assert_called_with(
             identity_fakes.idp_id, enabled=True)
         collist = ('description', 'enabled', 'id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.idp_description,
             True,
             identity_fakes.idp_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_identity_provider_no_options(self):
         def prepare(self):
@@ -368,5 +368,5 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
         # expect take_action() to return (None, None) as
         # neither --enable nor --disable was specified
-        self.assertEqual(columns, None)
-        self.assertEqual(data, None)
+        self.assertEqual(None, columns)
+        self.assertEqual(None, data)
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index f5c318fe..f6e88885 100644
--- a/openstackclient/tests/identity/v3/test_mappings.py
+++ b/openstackclient/tests/identity/v3/test_mappings.py
@@ -65,7 +65,7 @@ class TestMappingCreate(TestMapping):
                     rules=identity_fakes.MAPPING_RULES)
 
                 collist = ('id', 'rules')
-                self.assertEqual(columns, collist)
+                self.assertEqual(collist, columns)
 
                 datalist = (identity_fakes.mapping_id,
                             identity_fakes.MAPPING_RULES)
@@ -134,7 +134,7 @@ class TestMappingList(TestMapping):
         self.mapping_mock.list.assert_called_with()
 
         collist = ('ID',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
 
         datalist = [(identity_fakes.mapping_id,), ('extra_mapping',)]
         self.assertEqual(datalist, data)
@@ -167,7 +167,7 @@ class TestMappingShow(TestMapping):
             identity_fakes.mapping_id)
 
         collist = ('id', 'rules')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
 
         datalist = (identity_fakes.mapping_id,
                     identity_fakes.MAPPING_RULES)
@@ -216,7 +216,7 @@ class TestMappingSet(TestMapping):
             rules=identity_fakes.MAPPING_RULES_2)
 
         collist = ('id', 'rules')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (identity_fakes.mapping_id,
                     identity_fakes.MAPPING_RULES_2)
         self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_oauth.py b/openstackclient/tests/identity/v3/test_oauth.py
index 435042d1..dba6d034 100644
--- a/openstackclient/tests/identity/v3/test_oauth.py
+++ b/openstackclient/tests/identity/v3/test_oauth.py
@@ -72,14 +72,14 @@ class TestRequestTokenCreate(TestOAuth1):
         )
 
         collist = ('expires', 'id', 'key', 'secret')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.request_token_expires,
             identity_fakes.request_token_id,
             identity_fakes.request_token_id,
             identity_fakes.request_token_secret,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestRequestTokenAuthorize(TestOAuth1):
@@ -116,11 +116,11 @@ class TestRequestTokenAuthorize(TestOAuth1):
         )
 
         collist = ('oauth_verifier',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.oauth_verifier_pin,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestAccessTokenCreate(TestOAuth1):
@@ -163,11 +163,11 @@ class TestAccessTokenCreate(TestOAuth1):
         )
 
         collist = ('expires', 'id', 'key', 'secret')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.access_token_expires,
             identity_fakes.access_token_id,
             identity_fakes.access_token_id,
             identity_fakes.access_token_secret,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index d16f9732..874908da 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -83,7 +83,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -91,7 +91,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_description(self):
         arglist = [
@@ -123,7 +123,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -131,7 +131,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_domain(self):
         arglist = [
@@ -163,7 +163,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -171,7 +171,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_domain_no_perms(self):
         arglist = [
@@ -202,7 +202,7 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -210,7 +210,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_enable(self):
         arglist = [
@@ -241,7 +241,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -249,7 +249,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_disable(self):
         arglist = [
@@ -280,7 +280,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -288,7 +288,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_project_create_property(self):
         arglist = [
@@ -321,7 +321,7 @@ class TestProjectCreate(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -329,7 +329,7 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestProjectDelete(TestProject):
@@ -358,7 +358,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,
@@ -391,12 +391,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 = [
@@ -412,7 +412,7 @@ class TestProjectList(TestProject):
         self.projects_mock.list.assert_called_with()
 
         collist = ('ID', 'Name', 'Domain ID', 'Description', 'Enabled')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.project_id,
             identity_fakes.project_name,
@@ -420,7 +420,7 @@ class TestProjectList(TestProject):
             identity_fakes.project_description,
             True,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_project_list_domain(self):
         arglist = [
@@ -444,12 +444,12 @@ class TestProjectList(TestProject):
             domain=identity_fakes.domain_id)
 
         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_domain_no_perms(self):
         arglist = [
@@ -468,12 +468,12 @@ class TestProjectList(TestProject):
         self.projects_mock.list.assert_called_with(
             domain=identity_fakes.domain_id)
         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))
 
 
 class TestProjectSet(TestProject):
@@ -513,7 +513,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 = [
@@ -529,7 +529,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 = {
@@ -556,7 +556,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 = {
@@ -580,7 +580,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 = {
@@ -604,7 +604,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 = {
@@ -628,7 +628,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 = {
@@ -671,7 +671,7 @@ class TestProjectShow(TestProject):
         )
 
         collist = ('description', 'domain_id', 'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_description,
             identity_fakes.domain_id,
@@ -679,4 +679,4 @@ class TestProjectShow(TestProject):
             identity_fakes.project_id,
             identity_fakes.project_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_role.py b/openstackclient/tests/identity/v3/test_role.py
index 1a9e6aa7..84cf07a1 100644
--- a/openstackclient/tests/identity/v3/test_role.py
+++ b/openstackclient/tests/identity/v3/test_role.py
@@ -105,7 +105,7 @@ class TestRoleAdd(TestRole):
         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 = {
@@ -134,7 +134,7 @@ class TestRoleAdd(TestRole):
         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 = {
@@ -163,7 +163,7 @@ class TestRoleAdd(TestRole):
         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 = {
@@ -192,7 +192,7 @@ class TestRoleAdd(TestRole):
         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 = {
@@ -243,12 +243,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)
 
 
 class TestRoleDelete(TestRole):
@@ -331,12 +331,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))
 
     def test_user_list_user(self):
         arglist = [
@@ -361,12 +361,12 @@ class TestRoleList(TestRole):
         )
 
         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))
 
     def test_role_list_domain_user(self):
         arglist = [
@@ -393,14 +393,14 @@ class TestRoleList(TestRole):
         )
 
         collist = ('ID', 'Name', 'Domain', 'User')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
             identity_fakes.domain_name,
             identity_fakes.user_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_list_domain_group(self):
         arglist = [
@@ -427,14 +427,14 @@ class TestRoleList(TestRole):
         )
 
         collist = ('ID', 'Name', 'Domain', 'Group')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
             identity_fakes.domain_name,
             identity_fakes.group_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_list_project_user(self):
         arglist = [
@@ -461,14 +461,14 @@ class TestRoleList(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_role_list_project_group(self):
         arglist = [
@@ -495,14 +495,14 @@ class TestRoleList(TestRole):
         )
 
         collist = ('ID', 'Name', 'Project', 'Group')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.role_name,
             identity_fakes.project_name,
             identity_fakes.group_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestRoleRemove(TestRole):
@@ -733,9 +733,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/v3/test_role_assignment.py b/openstackclient/tests/identity/v3/test_role_assignment.py
index 6497ca8e..b1ce8b29 100644
--- a/openstackclient/tests/identity/v3/test_role_assignment.py
+++ b/openstackclient/tests/identity/v3/test_role_assignment.py
@@ -89,7 +89,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.user_id,
@@ -102,7 +102,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             identity_fakes.project_id,
             ''
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_user(self):
 
@@ -146,7 +146,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             effective=False)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.user_id,
@@ -159,7 +159,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             identity_fakes.project_id,
             ''
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_group(self):
 
@@ -203,7 +203,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             user=None)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             '',
@@ -216,7 +216,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             identity_fakes.project_id,
             ''
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_domain(self):
 
@@ -260,7 +260,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             user=None)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.user_id,
@@ -273,7 +273,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             '',
             identity_fakes.domain_id
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_project(self):
 
@@ -317,7 +317,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             user=None)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.user_id,
@@ -330,7 +330,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             identity_fakes.project_id,
             ''
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_effective(self):
 
@@ -372,7 +372,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             user=None)
 
         collist = ('Role', 'User', 'Group', 'Project', 'Domain')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.role_id,
             identity_fakes.user_id,
@@ -385,4 +385,4 @@ class TestRoleAssignmentList(TestRoleAssignment):
             '',
             identity_fakes.domain_id,
             ),)
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py
index 7766a29c..d2b54c7f 100644
--- a/openstackclient/tests/identity/v3/test_service.py
+++ b/openstackclient/tests/identity/v3/test_service.py
@@ -70,7 +70,7 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'enabled', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             True,
@@ -78,7 +78,7 @@ class TestServiceCreate(TestService):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_description(self):
         arglist = [
@@ -106,7 +106,7 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'enabled', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             True,
@@ -114,7 +114,7 @@ class TestServiceCreate(TestService):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_enable(self):
         arglist = [
@@ -142,7 +142,7 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'enabled', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             True,
@@ -150,7 +150,7 @@ class TestServiceCreate(TestService):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_service_create_disable(self):
         arglist = [
@@ -178,7 +178,7 @@ class TestServiceCreate(TestService):
         )
 
         collist = ('description', 'enabled', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             True,
@@ -186,7 +186,7 @@ class TestServiceCreate(TestService):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestServiceDelete(TestService):
@@ -214,7 +214,7 @@ class TestServiceDelete(TestService):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.run(parsed_args)
-        self.assertEqual(result, 0)
+        self.assertEqual(0, result)
 
         self.services_mock.delete.assert_called_with(
             identity_fakes.service_id,
@@ -248,13 +248,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 = [
@@ -271,7 +271,7 @@ class TestServiceList(TestService):
         self.services_mock.list.assert_called_with()
 
         collist = ('ID', 'Name', 'Type', 'Description', 'Enabled')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.service_id,
             identity_fakes.service_name,
@@ -279,7 +279,7 @@ class TestServiceList(TestService):
             identity_fakes.service_description,
             True,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 class TestServiceSet(TestService):
@@ -316,7 +316,7 @@ class TestServiceSet(TestService):
         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_service_set_type(self):
         arglist = [
@@ -334,7 +334,7 @@ class TestServiceSet(TestService):
         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 = {
@@ -362,7 +362,7 @@ class TestServiceSet(TestService):
         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 = {
@@ -390,7 +390,7 @@ class TestServiceSet(TestService):
         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 = {
@@ -418,7 +418,7 @@ class TestServiceSet(TestService):
         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 = {
@@ -446,7 +446,7 @@ class TestServiceSet(TestService):
         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 = {
@@ -491,7 +491,7 @@ class TestServiceShow(TestService):
         )
 
         collist = ('description', 'enabled', 'id', 'name', 'type')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.service_description,
             True,
@@ -499,4 +499,4 @@ class TestServiceShow(TestService):
             identity_fakes.service_name,
             identity_fakes.service_type,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_token.py b/openstackclient/tests/identity/v3/test_token.py
index f43b6f5f..6ad4845d 100644
--- a/openstackclient/tests/identity/v3/test_token.py
+++ b/openstackclient/tests/identity/v3/test_token.py
@@ -50,14 +50,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)
 
     def test_token_issue_with_domain_id(self):
         arglist = []
@@ -72,11 +72,11 @@ class TestTokenIssue(TestToken):
         self.sc_mock.get_token.assert_called_with()
 
         collist = ('domain_id', 'expires', 'id', 'user_id')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.domain_id,
             identity_fakes.token_expires,
             identity_fakes.token_id,
             identity_fakes.user_id,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_unscoped_saml.py b/openstackclient/tests/identity/v3/test_unscoped_saml.py
index 6b2d3f5b..6a799094 100644
--- a/openstackclient/tests/identity/v3/test_unscoped_saml.py
+++ b/openstackclient/tests/identity/v3/test_unscoped_saml.py
@@ -58,14 +58,14 @@ class TestProjectList(TestUnscopedSAML):
         self.projects_mock.list.assert_called_with()
 
         collist = ('ID', 'Domain ID', 'Enabled', 'Name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.project_id,
             identity_fakes.domain_id,
             True,
             identity_fakes.project_name,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_accessible_projects_list_wrong_auth(self):
         auth = identity_fakes.FakeAuth("wrong auth")
@@ -107,14 +107,14 @@ class TestDomainList(TestUnscopedSAML):
         self.domains_mock.list.assert_called_with()
 
         collist = ('ID', 'Enabled', 'Name', 'Description')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.domain_id,
             True,
             identity_fakes.domain_name,
             identity_fakes.domain_description,
         ), )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_accessible_domains_list_wrong_auth(self):
         auth = identity_fakes.FakeAuth("wrong auth")
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
index 35dd98ee..8d0b6d31 100644
--- a/openstackclient/tests/identity/v3/test_user.py
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -109,7 +109,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -118,7 +118,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_password(self):
         arglist = [
@@ -155,7 +155,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -164,7 +164,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_password_prompt(self):
         arglist = [
@@ -204,7 +204,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -213,7 +213,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_email(self):
         arglist = [
@@ -249,7 +249,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -258,7 +258,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_project(self):
         # Return the new project
@@ -309,7 +309,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.PROJECT_2['id'],
             identity_fakes.domain_id,
@@ -318,7 +318,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_domain(self):
         arglist = [
@@ -354,7 +354,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -363,7 +363,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_enable(self):
         arglist = [
@@ -398,7 +398,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -407,7 +407,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
     def test_user_create_disable(self):
         arglist = [
@@ -441,7 +441,7 @@ class TestUserCreate(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -450,7 +450,7 @@ class TestUserCreate(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)
 
 
 class TestUserDelete(TestUser):
@@ -553,7 +553,7 @@ class TestUserList(TestUser):
         )
 
         collist = ['ID', 'Name']
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.user_id,
             identity_fakes.user_name,
@@ -583,7 +583,7 @@ class TestUserList(TestUser):
         )
 
         collist = ['ID', 'Name']
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.user_id,
             identity_fakes.user_name,
@@ -613,7 +613,7 @@ class TestUserList(TestUser):
         )
 
         collist = ['ID', 'Name']
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.user_id,
             identity_fakes.user_name,
@@ -651,7 +651,7 @@ class TestUserList(TestUser):
             'Email',
             'Enabled',
         ]
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.user_id,
             identity_fakes.user_name,
@@ -683,7 +683,7 @@ class TestUserList(TestUser):
         self.users_mock.get.assert_called_with(identity_fakes.user_id)
 
         collist = ['ID', 'Name']
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.user_id,
             identity_fakes.user_name,
@@ -739,7 +739,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 = [
@@ -1077,7 +1077,7 @@ class TestUserShow(TestUser):
 
         collist = ('default_project_id', 'domain_id', 'email',
                    'enabled', 'id', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.project_id,
             identity_fakes.domain_id,
@@ -1086,4 +1086,4 @@ class TestUserShow(TestUser):
             identity_fakes.user_id,
             identity_fakes.user_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)