openstack/python-ironicclient
Code Issues Proposed changes

Fix params order in assertEqual

Browse Source 
Fix params oeder to correspond to real signature:
    assertEqual(expected, actual)

Change-Id: Iad65accc86a2d1f7df7284596e1bbceeb091d39e
Closes-Bug: #1277104
This commit is contained in:
Kan 2016-01-12 05:59:53 +00:00
parent 49891d2087
commit 5f87416ec1
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironicclient/tests/unit/common/apiclient/test_base.py
View File

@ -64,18 +64,18 @@ class CrudResourceManager(base.CrudManager):
class ResourceTest(test_base.BaseTestCase):
def test_resource_repr(self):
r = base.Resource(None, dict(foo="bar", baz="spam"))
self.assertEqual(repr(r), "<Resource baz=spam, foo=bar>")
self.assertEqual("<Resource baz=spam, foo=bar>", repr(r))
def test_getid(self):
class TmpObject(base.Resource):
id = "4"
self.assertEqual(base.getid(TmpObject(None, {})), "4")
self.assertEqual("4", base.getid(TmpObject(None, {})))
def test_human_id(self):
r = base.Resource(None, {"name": "1"})
self.assertIsNone(r.human_id)
r = HumanResource(None, {"name": "1"})
self.assertEqual(r.human_id, "1")
self.assertEqual("1", r.human_id)
r = HumanResource(None, {"name": None})
self.assertIsNone(r.human_id)
@ -146,7 +146,7 @@ class BaseManagerTestCase(test_base.BaseTestCase):
json={'id': 42}, return_raw=True)
self.manager.client.post.assert_called_with("/human_resources",
json={'id': 42})
self.assertEqual(result, {'id': 42})
self.assertEqual({'id': 42}, result)
def test_post_no_response_key(self):
self.response.json.return_value = {'id': 42}

26
ironicclient/tests/unit/common/apiclient/test_exceptions.py
View File

@ -45,11 +45,11 @@ class ExceptionsArgsTest(test_base.BaseTestCase):
if check_description:
expected_msg = error_msg or json_data["error"]["message"]
expected_details = error_details or json_data["error"]["details"]
self.assertEqual(ex.message, expected_msg)
self.assertEqual(ex.details, expected_details)
self.assertEqual(ex.method, method)
self.assertEqual(ex.url, url)
self.assertEqual(ex.http_status, status_code)
self.assertEqual(expected_msg, ex.message)
self.assertEqual(expected_details, ex.details)
self.assertEqual(method, ex.method)
self.assertEqual(url, ex.url)
self.assertEqual(status_code, ex.http_status)
def test_from_response_known(self):
method = "GET"
@ -115,10 +115,10 @@ class ExceptionsArgsTest(test_base.BaseTestCase):
method,
url)
self.assertIsInstance(ex, exceptions.BadRequest)
self.assertEqual(ex.details, text_data1)
self.assertEqual(ex.method, method)
self.assertEqual(ex.url, url)
self.assertEqual(ex.http_status, status_code)
self.assertEqual(text_data1, ex.details)
self.assertEqual(method, ex.method)
self.assertEqual(url, ex.url)
self.assertEqual(status_code, ex.http_status)
def test_from_response_with_text_response_format_with_no_body(self):
method = "GET"
@ -131,7 +131,7 @@ class ExceptionsArgsTest(test_base.BaseTestCase):
method,
url)
self.assertIsInstance(ex, exceptions.Unauthorized)
self.assertEqual(ex.details, '')
self.assertEqual(ex.method, method)
self.assertEqual(ex.url, url)
self.assertEqual(ex.http_status, status_code)
self.assertEqual('', ex.details)
self.assertEqual(method, ex.method)
self.assertEqual(url, ex.url)
self.assertEqual(status_code, ex.http_status)

16
ironicclient/tests/unit/common/test_cliutils.py
View File

@ -671,12 +671,12 @@ class EnvTestCase(test_base.BaseTestCase):
def test_env(self):
env = {"alpha": "a", "beta": "b"}
self.useFixture(fixtures.MonkeyPatch("os.environ", env))
self.assertEqual(cliutils.env("beta"), env["beta"])
self.assertEqual(cliutils.env("beta", "alpha"), env["beta"])
self.assertEqual(cliutils.env("alpha", "beta"), env["alpha"])
self.assertEqual(cliutils.env("gamma", "beta"), env["beta"])
self.assertEqual(cliutils.env("gamma"), "")
self.assertEqual(cliutils.env("gamma", default="c"), "c")
self.assertEqual(env["beta"], cliutils.env("beta"))
self.assertEqual(env["beta"], cliutils.env("beta", "alpha"))
self.assertEqual(env["alpha"], cliutils.env("alpha", "beta"))
self.assertEqual(env["beta"], cliutils.env("gamma", "beta"))
self.assertEqual("", cliutils.env("gamma"))
self.assertEqual("c", cliutils.env("gamma", default="c"))
class GetPasswordTestCase(test_base.BaseTestCase):
@ -693,14 +693,14 @@ class GetPasswordTestCase(test_base.BaseTestCase):
def test_get_password(self):
self.useFixture(fixtures.MonkeyPatch("getpass.getpass",
lambda prompt: "mellon"))
self.assertEqual(cliutils.get_password(), "mellon")
self.assertEqual("mellon", cliutils.get_password())
def test_get_password_verify(self):
env = {"OS_VERIFY_PASSWORD": "True"}
self.useFixture(fixtures.MonkeyPatch("os.environ", env))
self.useFixture(fixtures.MonkeyPatch("getpass.getpass",
lambda prompt: "mellon"))
self.assertEqual(cliutils.get_password(), "mellon")
self.assertEqual("mellon", cliutils.get_password())
def test_get_password_verify_failure(self):
env = {"OS_VERIFY_PASSWORD": "True"}