Using fixtures instead of deprecated mockpatch module
This module mockpatch of oslotest[1] is deprecated since version 1.13 and may be removed in version 2.0. Use fixtures.Mock* classes instead[2] [1]OpenStack Testing Framework and Utilities [2]https://docs.openstack.org/developer/oslotest/api/oslotest.mockpatch.html#module-oslotest.mockpatch Change-Id: Ie54cc051829cc2370cab9cd3a7d9542e2abc51ab
This commit is contained in:
parent
ed66241798
commit
1e36f23561
|
@ -16,12 +16,12 @@
|
|||
import collections
|
||||
import os
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
from oslo_config import fixture as fixture_config
|
||||
from oslo_utils import fileutils
|
||||
from oslo_utils import timeutils
|
||||
from oslotest import base
|
||||
from oslotest import mockpatch
|
||||
import six
|
||||
import yaml
|
||||
|
||||
|
@ -227,8 +227,9 @@ class TestMappedCeiloscaMetricProcessing(TestCeiloscaMapping):
|
|||
self.CONF([], project='ceilometer', validate_default_values=True)
|
||||
|
||||
def test_fallback_mapping_file_path(self):
|
||||
self.useFixture(mockpatch.PatchObject(self.CONF,
|
||||
'find_file', return_value=None))
|
||||
self.useFixture(fixtures.MockPatchObject(self.CONF,
|
||||
'find_file',
|
||||
return_value=None))
|
||||
fall_bak_path = ceilosca_mapping.get_config_file()
|
||||
self.assertIn("ceilosca_mapping/data/ceilosca_mapping.yaml",
|
||||
fall_bak_path)
|
||||
|
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
import os
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
from oslo_config import fixture as fixture_config
|
||||
from oslo_utils import fileutils
|
||||
from oslotest import base
|
||||
from oslotest import mockpatch
|
||||
import six
|
||||
import yaml
|
||||
|
||||
|
@ -161,8 +161,9 @@ class TestMappedCeilometerStaticInfoProcessing(TestStaticInfoBase):
|
|||
self.CONF([], project='ceilometer', validate_default_values=True)
|
||||
|
||||
def test_fallback_mapping_file_path(self):
|
||||
self.useFixture(mockpatch.PatchObject(self.CONF,
|
||||
'find_file', return_value=None))
|
||||
self.useFixture(fixtures.MockPatchObject(self.CONF,
|
||||
'find_file',
|
||||
return_value=None))
|
||||
self.CONF.set_override('ceilometer_static_info_mapping',
|
||||
' ', group='monasca')
|
||||
self.static_info_mapper.reinitialize()
|
||||
|
|
Loading…
Reference in New Issue