openstack/glance_store
Code Issues Proposed changes

Replace stubout with oslotest.moxstubout

Browse Source 
Change-Id: I9792df5979552871f6af3f1c8f7c90a9c63320ff
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
This commit is contained in:
Zhi Yan Liu 2014-09-19 15:38:54 +08:00
parent 8b6f3530a6
commit 7628f2bc56
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/test_swift_store.py
View File

@ -26,7 +26,6 @@ import uuid
from oslo.config import cfg from oslo.config import cfg
from oslotest import moxstubout from oslotest import moxstubout
import six import six
import stubout
import swiftclient import swiftclient
from glance_store._drivers.swift import store as swift from glance_store._drivers.swift import store as swift
@ -783,12 +782,12 @@ class TestStoreAuthV1(base.StoreBaseTest, SwiftTests):
self.swift_config_file = self.copy_data_file(conf_file, self.test_dir) self.swift_config_file = self.copy_data_file(conf_file, self.test_dir)
conf.update({'swift_store_config_file': self.swift_config_file}) conf.update({'swift_store_config_file': self.swift_config_file})
self.stubs = stubout.StubOutForTesting() moxfixture = self.useFixture(moxstubout.MoxStubout())
self.stubs = moxfixture.stubs
stub_out_swiftclient(self.stubs, conf['swift_store_auth_version']) stub_out_swiftclient(self.stubs, conf['swift_store_auth_version'])
self.store = Store(self.conf) self.store = Store(self.conf)
self.config(**conf) self.config(**conf)
self.store.configure() self.store.configure()
self.addCleanup(self.stubs.UnsetAll)
self.register_store_schemes(self.store) self.register_store_schemes(self.store)
swift.SWIFT_STORE_REF_PARAMS = sutils.SwiftParams().params swift.SWIFT_STORE_REF_PARAMS = sutils.SwiftParams().params
self.addCleanup(self.conf.reset) self.addCleanup(self.conf.reset)