diff options
Diffstat (limited to 'troveclient/tests')
| -rw-r--r-- | troveclient/tests/test_base.py | 32 | ||||
| -rw-r--r-- | troveclient/tests/test_v1_shell.py | 4 | ||||
| -rw-r--r-- | troveclient/tests/utils.py | 1 |
3 files changed, 19 insertions, 18 deletions
diff --git a/troveclient/tests/test_base.py b/troveclient/tests/test_base.py index bc409c2..cd8affa 100644 --- a/troveclient/tests/test_base.py +++ b/troveclient/tests/test_base.py @@ -212,38 +212,38 @@ class ManagerListTest(ManagerTest): def test_list_with_body_none(self): body = None - l = self.manager._list("url", self.response_key, obj_class, body) - self.assertEqual(len(self.data_g), len(l)) - for i in range(0, len(l)): - self.assertEqual(self.data_g[i], l[i]) + li = self.manager._list("url", self.response_key, obj_class, body) + self.assertEqual(len(self.data_g), len(li)) + for i in range(0, len(li)): + self.assertEqual(self.data_g[i], li[i]) def test_list_body_not_none(self): body = "something" - l = self.manager._list("url", self.response_key, obj_class, body) - self.assertEqual(len(self.data_p), len(l)) - for i in range(0, len(l)): - self.assertEqual(self.data_p[i], l[i]) + li = self.manager._list("url", self.response_key, obj_class, body) + self.assertEqual(len(self.data_p), len(li)) + for i in range(0, len(li)): + self.assertEqual(self.data_p[i], li[i]) def test_list_key_mapping(self): data_ = {"values": ["p1", "p2"]} body_ = {self.response_key: data_} url_ = "test_url_post" self.manager.api.client.post = mock.Mock(return_value=(url_, body_)) - l = self.manager._list("url", self.response_key, - obj_class, "something") + li = self.manager._list("url", self.response_key, + obj_class, "something") data = data_["values"] - self.assertEqual(len(data), len(l)) - for i in range(0, len(l)): - self.assertEqual(data[i], l[i]) + self.assertEqual(len(data), len(li)) + for i in range(0, len(li)): + self.assertEqual(data[i], li[i]) def test_list_without_key_mapping(self): data_ = {"v1": "1", "v2": "2"} body_ = {self.response_key: data_} url_ = "test_url_post" self.manager.api.client.post = mock.Mock(return_value=(url_, body_)) - l = self.manager._list("url", self.response_key, - obj_class, "something") - self.assertEqual(len(data_), len(l)) + li = self.manager._list("url", self.response_key, + obj_class, "something") + self.assertEqual(len(data_), len(li)) class MangerPaginationTests(ManagerTest): diff --git a/troveclient/tests/test_v1_shell.py b/troveclient/tests/test_v1_shell.py index e6adb83..07b709e 100644 --- a/troveclient/tests/test_v1_shell.py +++ b/troveclient/tests/test_v1_shell.py @@ -221,7 +221,7 @@ class ShellTest(utils.TestCase): def test_flavor_list_error(self): cmd = 'flavor-list --datastore_type mysql' - exepcted_error_msg = ('Missing argument\(s\): ' + exepcted_error_msg = (r'Missing argument\(s\): ' 'datastore_type, datastore_version_id') self.assertRaisesRegex( exceptions.MissingArgs, exepcted_error_msg, self.run_command, @@ -256,7 +256,7 @@ class ShellTest(utils.TestCase): def test_volume_type_list_error(self): cmd = 'volume-type-list --datastore_type mysql' - exepcted_error_msg = ('Missing argument\(s\): ' + exepcted_error_msg = (r'Missing argument\(s\): ' 'datastore_type, datastore_version_id') self.assertRaisesRegex( exceptions.MissingArgs, exepcted_error_msg, self.run_command, diff --git a/troveclient/tests/utils.py b/troveclient/tests/utils.py index 77d8506..b24358b 100644 --- a/troveclient/tests/utils.py +++ b/troveclient/tests/utils.py @@ -58,6 +58,7 @@ def _patch_mock_to_raise_for_invalid_assert_calls(): mock.Mock.__getattr__ = raise_for_invalid_assert_calls( mock.Mock.__getattr__) + # NOTE(gibi): needs to be called only once at import time # to patch the mock lib _patch_mock_to_raise_for_invalid_assert_calls() |