From ea2693b9d9aa65af603814c5eb44414839216bd5 Mon Sep 17 00:00:00 2001
From: reedip <reedip.banerjee@nectechnologies.in>
Date: Wed, 6 Jan 2016 12:21:52 +0900
Subject: [PATCH] Fix argument order for assertEqual to (expected, observed)
assertEqual expects that the arguments provided to it should be
(expected, observed). If a particluar order is kept as a convention,
then it helps to provide a cleaner message to the developer if Unit
Tests fail. The following patch fixes this issue.
TrivialFix
Change-Id: I817a654733e0f3886ca85778a49aa579592f60ff
Closes-Bug: #1259292
---
cinderclient/tests/unit/test_auth_plugins.py | 4 ++--
cinderclient/tests/unit/test_http.py | 4 ++--
cinderclient/tests/unit/test_shell.py | 4 ++--
cinderclient/tests/unit/utils.py | 6 +++---
cinderclient/tests/unit/v1/test_shell.py | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cinderclient/tests/unit/test_auth_plugins.py b/cinderclient/tests/unit/test_auth_plugins.py
index 7eabe1dd8..0afe044bb 100644
--- a/cinderclient/tests/unit/test_auth_plugins.py
+++ b/cinderclient/tests/unit/test_auth_plugins.py
@@ -182,7 +182,7 @@ class DeprecatedAuthPluginTest(utils.TestCase):
auth_system="fakewithauthurl",
auth_plugin=plugin)
cs.client.authenticate()
- self.assertEqual(cs.client.auth_url, "http://faked/v2.0")
+ self.assertEqual("http://faked/v2.0", cs.client.auth_url)
test_auth_call()
@@ -336,7 +336,7 @@ class AuthPluginTest(utils.TestCase):
cs = client.Client("username", "password", "project_id",
auth_system="fakewithauthurl",
auth_plugin=plugin)
- self.assertEqual(cs.client.auth_url, "http://faked/v2.0")
+ self.assertEqual("http://faked/v2.0", cs.client.auth_url)
@mock.patch.object(pkg_resources, "iter_entry_points")
def test_exception_if_no_authenticate(self, mock_iter_entry_points):
diff --git a/cinderclient/tests/unit/test_http.py b/cinderclient/tests/unit/test_http.py
index f9997bc49..b425fd817 100644
--- a/cinderclient/tests/unit/test_http.py
+++ b/cinderclient/tests/unit/test_http.py
@@ -156,7 +156,7 @@ class ClientTest(utils.TestCase):
resp, body = cl.get("/hi")
test_get_call()
- self.assertEqual(self.requests, [])
+ self.assertEqual([], self.requests)
def test_retry_limit(self):
cl = get_authed_client(retries=1)
@@ -277,4 +277,4 @@ class ClientTest(utils.TestCase):
resp, body = cl.get("/hi")
test_get_call()
- self.assertEqual(self.requests, [])
+ self.assertEqual([], self.requests)
diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py
index a2439f2fa..53430465e 100644
--- a/cinderclient/tests/unit/test_shell.py
+++ b/cinderclient/tests/unit/test_shell.py
@@ -113,14 +113,14 @@ class ShellTest(utils.TestCase):
self.register_keystone_auth_fixture(mocker, os_auth_url)
v2_url, v3_url = _shell._discover_auth_versions(
None, auth_url=os_auth_url)
- self.assertEqual(v2_url, os_auth_url, "Expected v2 url")
+ self.assertEqual(os_auth_url, v2_url, "Expected v2 url")
self.assertIsNone(v3_url, "Expected no v3 url")
os_auth_url = "https://DiscoveryNotSupported.discovery.com:35357/v3.0"
self.register_keystone_auth_fixture(mocker, os_auth_url)
v2_url, v3_url = _shell._discover_auth_versions(
None, auth_url=os_auth_url)
- self.assertEqual(v3_url, os_auth_url, "Expected v3 url")
+ self.assertEqual(os_auth_url, v3_url, "Expected v3 url")
self.assertIsNone(v2_url, "Expected no v2 url")
@requests_mock.Mocker()
diff --git a/cinderclient/tests/unit/utils.py b/cinderclient/tests/unit/utils.py
index ddf8972f6..adea96f4d 100644
--- a/cinderclient/tests/unit/utils.py
+++ b/cinderclient/tests/unit/utils.py
@@ -68,8 +68,8 @@ class FixturedTestCase(TestCase):
self.data_fixture = self.useFixture(fix)
def assert_called(self, method, path, body=None):
- self.assertEqual(self.requests.last_request.method, method)
- self.assertEqual(self.requests.last_request.path_url, path)
+ self.assertEqual(method, self.requests.last_request.method)
+ self.assertEqual(path, self.requests.last_request.path_url)
if body:
req_data = self.requests.last_request.body
@@ -78,7 +78,7 @@ class FixturedTestCase(TestCase):
if not isinstance(body, six.string_types):
# json load if the input body to match against is not a string
req_data = json.loads(req_data)
- self.assertEqual(req_data, body)
+ self.assertEqual(body, req_data)
class TestResponse(requests.Response):
diff --git a/cinderclient/tests/unit/v1/test_shell.py b/cinderclient/tests/unit/v1/test_shell.py
index 936f5a5b6..f62b9ab01 100644
--- a/cinderclient/tests/unit/v1/test_shell.py
+++ b/cinderclient/tests/unit/v1/test_shell.py
@@ -105,7 +105,7 @@ class ShellTest(utils.TestCase):
'id': 1234, 'display_name': 'sample-volume',
'os-vol-tenant-attr:tenant_id': 'fake_tenant'})
shell_v1._translate_volume_keys([v])
- self.assertEqual(v.tenant_id, 'fake_tenant')
+ self.assertEqual('fake_tenant', v.tenant_id)
def test_list(self):
self.run_command('list')