From 127af151ff60d11e7b2f88555678cf18b8828e48 Mon Sep 17 00:00:00 2001 From: wanghong Date: Tue, 27 Jan 2015 17:02:41 +0800 Subject: fix the wrong order of assertEqual args Let's fix them thoroughly. Change-Id: I8a1f042fb614b05c9836a49041f3883638b870b0 --- openstackclient/tests/common/test_commandmanager.py | 10 +++++----- openstackclient/tests/common/test_extension.py | 16 ++++++++-------- openstackclient/tests/common/test_parseractions.py | 2 +- openstackclient/tests/common/test_utils.py | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'openstackclient/tests/common') diff --git a/openstackclient/tests/common/test_commandmanager.py b/openstackclient/tests/common/test_commandmanager.py index e7803a48..056b637d 100644 --- a/openstackclient/tests/common/test_commandmanager.py +++ b/openstackclient/tests/common/test_commandmanager.py @@ -55,22 +55,22 @@ class TestCommandManager(utils.TestCase): mock_cmd_one = mock.Mock() mgr.add_command('mock', mock_cmd_one) cmd_mock, name, args = mgr.find_command(['mock']) - self.assertEqual(cmd_mock, mock_cmd_one) + self.assertEqual(mock_cmd_one, cmd_mock) # Find a command added in initialization cmd_one, name, args = mgr.find_command(['one']) - self.assertEqual(cmd_one, FAKE_CMD_ONE) + self.assertEqual(FAKE_CMD_ONE, cmd_one) # Load another command group mgr.add_command_group('greek') # Find a new command cmd_alpha, name, args = mgr.find_command(['alpha']) - self.assertEqual(cmd_alpha, FAKE_CMD_ALPHA) + self.assertEqual(FAKE_CMD_ALPHA, cmd_alpha) # Ensure that the original commands were not overwritten cmd_two, name, args = mgr.find_command(['two']) - self.assertEqual(cmd_two, FAKE_CMD_TWO) + self.assertEqual(FAKE_CMD_TWO, cmd_two) def test_get_command_groups(self): mgr = FakeCommandManager('test') @@ -79,7 +79,7 @@ class TestCommandManager(utils.TestCase): mock_cmd_one = mock.Mock() mgr.add_command('mock', mock_cmd_one) cmd_mock, name, args = mgr.find_command(['mock']) - self.assertEqual(cmd_mock, mock_cmd_one) + self.assertEqual(mock_cmd_one, cmd_mock) # Load another command group mgr.add_command_group('greek') diff --git a/openstackclient/tests/common/test_extension.py b/openstackclient/tests/common/test_extension.py index 5561345b..8327a414 100644 --- a/openstackclient/tests/common/test_extension.py +++ b/openstackclient/tests/common/test_extension.py @@ -75,7 +75,7 @@ class TestExtensionList(TestExtension): self.identity_extensions_mock.list.assert_called_with() collist = ('Name', 'Alias', 'Description') - self.assertEqual(columns, collist) + self.assertEqual(collist, columns) datalist = ( ( identity_fakes.extension_name, @@ -88,7 +88,7 @@ class TestExtensionList(TestExtension): network_fakes.extension_description, ), ) - self.assertEqual(tuple(data), datalist) + self.assertEqual(datalist, tuple(data)) def test_extension_list_long(self): arglist = [ @@ -107,7 +107,7 @@ class TestExtensionList(TestExtension): collist = ('Name', 'Namespace', 'Description', 'Alias', 'Updated', 'Links') - self.assertEqual(columns, collist) + self.assertEqual(collist, columns) datalist = ( ( identity_fakes.extension_name, @@ -126,7 +126,7 @@ class TestExtensionList(TestExtension): network_fakes.extension_links, ), ) - self.assertEqual(tuple(data), datalist) + self.assertEqual(datalist, tuple(data)) def test_extension_list_identity(self): arglist = [ @@ -143,13 +143,13 @@ class TestExtensionList(TestExtension): self.identity_extensions_mock.list.assert_called_with() collist = ('Name', 'Alias', 'Description') - self.assertEqual(columns, collist) + self.assertEqual(collist, columns) datalist = (( identity_fakes.extension_name, identity_fakes.extension_alias, identity_fakes.extension_description, ), ) - self.assertEqual(tuple(data), datalist) + self.assertEqual(datalist, tuple(data)) def test_extension_list_network(self): arglist = [ @@ -165,7 +165,7 @@ class TestExtensionList(TestExtension): self.network_extensions_mock.assert_called_with() collist = ('Name', 'Alias', 'Description') - self.assertEqual(columns, collist) + self.assertEqual(collist, columns) datalist = ( ( network_fakes.extension_name, @@ -173,4 +173,4 @@ class TestExtensionList(TestExtension): network_fakes.extension_description, ), ) - self.assertEqual(tuple(data), datalist) + self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/common/test_parseractions.py b/openstackclient/tests/common/test_parseractions.py index f26f2891..8afcb632 100644 --- a/openstackclient/tests/common/test_parseractions.py +++ b/openstackclient/tests/common/test_parseractions.py @@ -101,4 +101,4 @@ class TestKeyValueAction(utils.TestCase): # There should be no red or blue expect = {'green': '100%'} self.assertDictEqual(expect, actual) - self.assertEqual(failhere, None) + self.assertEqual(None, failhere) diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py index e782d410..583ab99c 100644 --- a/openstackclient/tests/common/test_utils.py +++ b/openstackclient/tests/common/test_utils.py @@ -31,7 +31,7 @@ class TestUtils(test_utils.TestCase): mock_stdin = mock.Mock() mock_stdin.isatty = mock.Mock() mock_stdin.isatty.return_value = True - self.assertEqual(utils.get_password(mock_stdin), PASSWORD) + self.assertEqual(PASSWORD, utils.get_password(mock_stdin)) def test_get_password_bad_once(self): answers = [PASSWORD, WASSPORD, DROWSSAP, DROWSSAP] @@ -39,7 +39,7 @@ class TestUtils(test_utils.TestCase): mock_stdin = mock.Mock() mock_stdin.isatty = mock.Mock() mock_stdin.isatty.return_value = True - self.assertEqual(utils.get_password(mock_stdin), DROWSSAP) + self.assertEqual(DROWSSAP, utils.get_password(mock_stdin)) def test_get_password_no_tty(self): mock_stdin = mock.Mock() -- cgit v1.2.1