openstack/cinder
Code Issues Proposed changes

Merge "Fix glance create client unit tests"

Browse Source
This commit is contained in:
Zuul 2018-01-17 17:38:33 +00:00 committed by Gerrit Code Review
commit 785ceac51c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/image/test_glance.py
View File

@ -822,6 +822,7 @@ class TestGlanceImageServiceClient(test.TestCase):
@mock.patch.object(ks_session.Session, 'load_from_options') @mock.patch.object(ks_session.Session, 'load_from_options')
def test_create_glance_client_with_protocol_http( def test_create_glance_client_with_protocol_http(
self, mock_load, mock_get_auth_plugin): self, mock_load, mock_get_auth_plugin):
glance._SESSION = None
self.flags(auth_strategy='keystone') self.flags(auth_strategy='keystone')
self.flags(glance_request_timeout=None) self.flags(glance_request_timeout=None)
@ -850,6 +851,7 @@ class TestGlanceImageServiceClient(test.TestCase):
@mock.patch.object(ks_session.Session, 'load_from_options') @mock.patch.object(ks_session.Session, 'load_from_options')
def test_create_glance_client_with_protocol_https( def test_create_glance_client_with_protocol_https(
self, mock_load, mock_get_auth_plugin): self, mock_load, mock_get_auth_plugin):
glance._SESSION = None
self.flags(auth_strategy='keystone') self.flags(auth_strategy='keystone')
self.flags(glance_request_timeout=60) self.flags(glance_request_timeout=60)
self.flags( self.flags(