diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-17 21:35:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-17 21:35:42 +0000 |
| commit | ba825a4d5c04e2e6fd8a82ebbfb2f71a85e683aa (patch) | |
| tree | e562fde72064e65efca04485b2b0d6f618de5aaa /openstackclient/tests/common | |
| parent | b83d0200d98d71470404e430ffbd040b40cd4060 (diff) | |
| parent | fe0c8e955be0331aef9cc6847c9bddc43ce66d92 (diff) | |
| download | python-openstackclient-ba825a4d5c04e2e6fd8a82ebbfb2f71a85e683aa.tar.gz | |
Merge "Do not prompt for scope options with default scoped tokens"
Diffstat (limited to 'openstackclient/tests/common')
| -rw-r--r-- | openstackclient/tests/common/test_clientmanager.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index 520cce13..0a9965e0 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -356,8 +356,8 @@ class TestClientManager(utils.TestCase): client_manager.setup_auth, ) - @mock.patch('openstackclient.api.auth.check_valid_auth_options') - def test_client_manager_auth_setup_once(self, check_auth_options_func): + @mock.patch('openstackclient.api.auth.check_valid_authentication_options') + def test_client_manager_auth_setup_once(self, check_authn_options_func): client_manager = clientmanager.ClientManager( cli_options=FakeOptions( auth=dict( @@ -372,11 +372,11 @@ class TestClientManager(utils.TestCase): ) self.assertFalse(client_manager._auth_setup_completed) client_manager.setup_auth() - self.assertTrue(check_auth_options_func.called) + self.assertTrue(check_authn_options_func.called) self.assertTrue(client_manager._auth_setup_completed) # now make sure we don't do auth setup the second time around # by checking whether check_valid_auth_options() gets called again - check_auth_options_func.reset_mock() + check_authn_options_func.reset_mock() client_manager.auth_ref - check_auth_options_func.assert_not_called() + check_authn_options_func.assert_not_called() |
