Remove mock testing of os-client-config for swift
This test does not test shade - it tests implementation details of os-client-config. We test those in os-client-config. Change-Id: I1a24e1718995b7ac508aec77c7dd351ef22cba74
This commit is contained in:
parent
a6858ebde0
commit
ef263d6a23
@ -16,7 +16,6 @@
|
||||
import mock
|
||||
import os_client_config
|
||||
from os_client_config import cloud_config
|
||||
from swiftclient import client as swift_client
|
||||
from swiftclient import service as swift_service
|
||||
from swiftclient import exceptions as swift_exc
|
||||
import testtools
|
||||
@ -36,24 +35,6 @@ class TestObject(base.TestCase):
|
||||
self.cloud = OpenStackCloud(
|
||||
cloud_config=config.get_one_cloud(validate=False))
|
||||
|
||||
@mock.patch.object(swift_client, 'Connection')
|
||||
@mock.patch.object(cloud_config.CloudConfig, 'get_session')
|
||||
def test_swift_client(self, get_session_mock, swift_mock):
|
||||
session_mock = mock.Mock()
|
||||
session_mock.get_endpoint.return_value = 'danzig'
|
||||
session_mock.get_token.return_value = 'yankee'
|
||||
get_session_mock.return_value = session_mock
|
||||
|
||||
self.cloud.swift_client
|
||||
swift_mock.assert_called_with(
|
||||
preauthurl='danzig',
|
||||
preauthtoken='yankee',
|
||||
auth_version=mock.ANY,
|
||||
os_options=dict(
|
||||
object_storage_url='danzig',
|
||||
auth_token='yankee',
|
||||
region_name=''))
|
||||
|
||||
@mock.patch.object(cloud_config.CloudConfig, 'get_session')
|
||||
def test_swift_client_no_endpoint(self, get_session_mock):
|
||||
session_mock = mock.Mock()
|
||||
|
Loading…
x
Reference in New Issue
Block a user