x/bilean
Code Issues Proposed changes

Merge "Remove deprecated oslotest.mockpatch usage"

Browse Source
This commit is contained in:
Zuul 2017-10-27 06:23:46 +00:00 committed by Gerrit Code Review
commit 5503d44ee5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bilean/tests/common/base.py
View File

@ -14,7 +14,6 @@ import logging
import os import os
import fixtures import fixtures
from oslotest import mockpatch
import testscenarios import testscenarios
import testtools import testtools
@ -67,12 +66,12 @@ class BileanTestCase(testscenarios.WithScenarios,
self.addCleanup(utils.reset_dummy_db) self.addCleanup(utils.reset_dummy_db)
def patchobject(self, obj, attr, **kwargs): def patchobject(self, obj, attr, **kwargs):
mockfixture = self.useFixture(mockpatch.PatchObject(obj, attr, mockfixture = self.useFixture(fixtures.MockPatchObject(obj, attr,
**kwargs)) **kwargs))
return mockfixture.mock return mockfixture.mock
# NOTE(pshchelo): this overrides the testtools.TestCase.patch method # NOTE(pshchelo): this overrides the testtools.TestCase.patch method
# that does simple monkey-patching in favor of mock's patching # that does simple monkey-patching in favor of mock's patching
def patch(self, target, **kwargs): def patch(self, target, **kwargs):
mockfixture = self.useFixture(mockpatch.Patch(target, **kwargs)) mockfixture = self.useFixture(fixtures.MockPatch(target, **kwargs))
return mockfixture.mock return mockfixture.mock