diff --git a/ceilosca/ceilometer/tests/functional/api/v2/test_api_with_monasca_driver.py b/ceilosca/ceilometer/tests/functional/api/v2/test_api_with_monasca_driver.py index 2c3d6c3..a862b87 100644 --- a/ceilosca/ceilometer/tests/functional/api/v2/test_api_with_monasca_driver.py +++ b/ceilosca/ceilometer/tests/functional/api/v2/test_api_with_monasca_driver.py @@ -15,12 +15,12 @@ """Test api with Monasca driver """ +import fixtures import mock import pkg_resources from oslo_config import cfg from oslo_config import fixture as fixture_config -from oslotest import mockpatch from stevedore import driver from stevedore import extension @@ -109,7 +109,7 @@ class TestApi(test_base.BaseTestCase): self.conn = storage.get_connection('monasca://127.0.0.1:8080', 'ceilometer.metering.storage') - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'ceilometer.storage.get_connection', return_value=self.conn)) diff --git a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py index f11c6fc..6030505 100755 --- a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py +++ b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py @@ -16,6 +16,7 @@ """ import datetime +import fixtures import os import time @@ -25,7 +26,6 @@ from oslo_config import cfg from oslo_config import fixture as fixture_config from oslo_utils import fileutils from oslotest import base -from oslotest import mockpatch from ceilometer import monasca_client as mon_client from ceilometer.publisher import monclient @@ -203,7 +203,7 @@ class TestMonascaPublisher(base.BaseTestCase): self.CONF.set_override('batch_mode', False, group='monasca') self.fake_publisher = mock.Mock() - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'ceilometer.publisher.file.FilePublisher', return_value=self.fake_publisher))