diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-02 19:29:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-02 19:29:04 +0000 |
| commit | cc36f3448077258816f58997e8cd9dea54feb00c (patch) | |
| tree | faf5543d85763ed2c27dd42c4173b25b2a9f4898 | |
| parent | 29fcefc67ad2005bd2ef4615d63c0e4876ffd794 (diff) | |
| parent | 69ada31fbda0c3b1c68c9200687c29c58ef531cb (diff) | |
| download | python-glanceclient-cc36f3448077258816f58997e8cd9dea54feb00c.tar.gz | |
Merge "Fix client initialization in shell tests"
| -rw-r--r-- | glanceclient/tests/unit/test_shell.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index beba3e6..f4c14d0 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__()) |