From 69ada31fbda0c3b1c68c9200687c29c58ef531cb Mon Sep 17 00:00:00 2001 From: kairat_kushaev Date: Mon, 1 Feb 2016 17:56:34 +0300 Subject: [PATCH] Fix client initialization in shell tests Shell tests initialized glanceclient with force_auth parameter but this parameter doesn't exist at all. The patch fixes this behavior and modifies client mocking to prevent from these errors in future. Change-Id: If4b469cf8da8105204a7f1f6e80ae19b86c7daee --- glanceclient/tests/unit/test_shell.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index beba3e64..f4c14d07 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -615,9 +615,11 @@ class ShellCacheSchemaTest(testutils.TestCase): self.client.schemas.get.return_value = schemas.Schema(schema_odict) def _mock_shell_setup(self): - mocked_get_client = mock.MagicMock(return_value=self.client) self.shell = openstack_shell.OpenStackImagesShell() - self.shell._get_versioned_client = mocked_get_client + self.shell._get_versioned_client = mock.create_autospec( + self.shell._get_versioned_client, return_value=self.client, + spec_set=True + ) def _make_args(self, args): class Args(object): @@ -636,7 +638,7 @@ class ShellCacheSchemaTest(testutils.TestCase): schema_odict = OrderedDict(self.schema_dict) args = self._make_args(options) - client = self.shell._get_versioned_client('2', args, force_auth=True) + client = self.shell._get_versioned_client('2', args) self.shell._cache_schemas(args, client, home_dir=self.cache_dir) self.assertEqual(12, open.mock_calls.__len__()) @@ -659,7 +661,7 @@ class ShellCacheSchemaTest(testutils.TestCase): schema_odict = OrderedDict(self.schema_dict) args = self._make_args(options) - client = self.shell._get_versioned_client('2', args, force_auth=True) + client = self.shell._get_versioned_client('2', args) self.shell._cache_schemas(args, client, home_dir=self.cache_dir) self.assertEqual(12, open.mock_calls.__len__())