diff --git a/tempest/tests/lib/services/base.py b/tempest/tests/lib/services/base.py index a244aa2e60..71b7f2d54d 100644 --- a/tempest/tests/lib/services/base.py +++ b/tempest/tests/lib/services/base.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +import fixtures from oslo_serialization import jsonutils as json -from oslotest import mockpatch from tempest.tests import base from tempest.tests.lib import fake_http @@ -33,7 +33,7 @@ class BaseServiceTest(base.TestCase): body, to_utf=False, status=200, headers=None, **kwargs): mocked_response = self.create_response(body, to_utf, status, headers) - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( function2mock, return_value=mocked_response)) if kwargs: resp = function(**kwargs) diff --git a/tempest/tests/lib/services/compute/test_flavors_client.py b/tempest/tests/lib/services/compute/test_flavors_client.py index 445ee22681..cbd17c688a 100644 --- a/tempest/tests/lib/services/compute/test_flavors_client.py +++ b/tempest/tests/lib/services/compute/test_flavors_client.py @@ -14,8 +14,8 @@ import copy +import fixtures from oslo_serialization import jsonutils as json -from oslotest import mockpatch from tempest.lib.services.compute import flavors_client from tempest.tests.lib import fake_auth_provider @@ -118,7 +118,7 @@ class TestFlavorsClient(base.BaseServiceTest): if bytes_body: body = body.encode('utf-8') response = fake_http.fake_http_response({}, status=200), body - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'tempest.lib.common.rest_client.RestClient.get', return_value=response)) self.assertEqual(is_deleted, diff --git a/tempest/tests/lib/services/compute/test_floating_ips_client.py b/tempest/tests/lib/services/compute/test_floating_ips_client.py index 92737f2ccc..950f9ce7be 100644 --- a/tempest/tests/lib/services/compute/test_floating_ips_client.py +++ b/tempest/tests/lib/services/compute/test_floating_ips_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslotest import mockpatch +import fixtures from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import floating_ips_client @@ -99,14 +99,14 @@ class TestFloatingIpsClient(base.BaseServiceTest): server_id='c782b7a9-33cd-45f0-b795-7f87f456408b') def test_is_resource_deleted_true(self): - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'tempest.lib.services.compute.floating_ips_client.' 'FloatingIPsClient.show_floating_ip', side_effect=lib_exc.NotFound())) self.assertTrue(self.client.is_resource_deleted('fake-id')) def test_is_resource_deleted_false(self): - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'tempest.lib.services.compute.floating_ips_client.' 'FloatingIPsClient.show_floating_ip', return_value={"floating_ip": TestFloatingIpsClient.floating_ip})) diff --git a/tempest/tests/lib/services/compute/test_images_client.py b/tempest/tests/lib/services/compute/test_images_client.py index a9a570d049..c2c3b7618d 100644 --- a/tempest/tests/lib/services/compute/test_images_client.py +++ b/tempest/tests/lib/services/compute/test_images_client.py @@ -14,8 +14,7 @@ import copy -from oslotest import mockpatch - +import fixtures from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import images_client from tempest.tests.lib import fake_auth_provider @@ -187,15 +186,15 @@ class TestImagesClient(base.BaseServiceTest): def _test_resource_deleted(self, bytes_body=False): params = {"id": self.FAKE_IMAGE_ID} expected_op = self.FAKE_IMAGE_DATA['show'] - self.useFixture(mockpatch.Patch('tempest.lib.services.compute' + self.useFixture(fixtures.MockPatch('tempest.lib.services.compute' '.images_client.ImagesClient.show_image', - side_effect=lib_exc.NotFound)) + side_effect=lib_exc.NotFound)) self.assertEqual(True, self.client.is_resource_deleted(**params)) tempdata = copy.deepcopy(self.FAKE_IMAGE_DATA['show']) tempdata['image']['id'] = None - self.useFixture(mockpatch.Patch('tempest.lib.services.compute' + self.useFixture(fixtures.MockPatch('tempest.lib.services.compute' '.images_client.ImagesClient.show_image', - return_value=expected_op)) + return_value=expected_op)) self.assertEqual(False, self.client.is_resource_deleted(**params)) def test_list_images_with_str_body(self): diff --git a/tempest/tests/lib/services/compute/test_security_groups_client.py b/tempest/tests/lib/services/compute/test_security_groups_client.py index d293a08b01..7bbf20e934 100644 --- a/tempest/tests/lib/services/compute/test_security_groups_client.py +++ b/tempest/tests/lib/services/compute/test_security_groups_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslotest import mockpatch +import fixtures from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import security_groups_client @@ -103,11 +103,11 @@ class TestSecurityGroupsClient(base.BaseServiceTest): def test_is_resource_deleted_true(self): mod = ('tempest.lib.services.compute.security_groups_client.' 'SecurityGroupsClient.show_security_group') - self.useFixture(mockpatch.Patch(mod, side_effect=lib_exc.NotFound)) + self.useFixture(fixtures.MockPatch(mod, side_effect=lib_exc.NotFound)) self.assertTrue(self.client.is_resource_deleted('fake-id')) def test_is_resource_deleted_false(self): mod = ('tempest.lib.services.compute.security_groups_client.' 'SecurityGroupsClient.show_security_group') - self.useFixture(mockpatch.Patch(mod, return_value='success')) + self.useFixture(fixtures.MockPatch(mod, return_value='success')) self.assertFalse(self.client.is_resource_deleted('fake-id')) diff --git a/tempest/tests/lib/services/compute/test_server_groups_client.py b/tempest/tests/lib/services/compute/test_server_groups_client.py index bf03b84a83..1c535ca50d 100644 --- a/tempest/tests/lib/services/compute/test_server_groups_client.py +++ b/tempest/tests/lib/services/compute/test_server_groups_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslotest import mockpatch +import fixtures from tempest.tests.lib import fake_auth_provider from tempest.lib.services.compute import server_groups_client @@ -50,7 +50,7 @@ class TestServerGroupsClient(base.BaseServiceTest): def test_delete_server_group(self): response = fake_http.fake_http_response({}, status=204), '' - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( 'tempest.lib.common.rest_client.RestClient.delete', return_value=response)) self.client.delete_server_group('fake-group') diff --git a/tempest/tests/lib/services/compute/test_snapshots_client.py b/tempest/tests/lib/services/compute/test_snapshots_client.py index 1629943803..1e2902c6ba 100644 --- a/tempest/tests/lib/services/compute/test_snapshots_client.py +++ b/tempest/tests/lib/services/compute/test_snapshots_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslotest import mockpatch +import fixtures from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import snapshots_client @@ -91,13 +91,13 @@ class TestSnapshotsClient(base.BaseServiceTest): def test_is_resource_deleted_true(self): module = ('tempest.lib.services.compute.snapshots_client.' 'SnapshotsClient.show_snapshot') - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( module, side_effect=lib_exc.NotFound)) self.assertTrue(self.client.is_resource_deleted('fake-id')) def test_is_resource_deleted_false(self): module = ('tempest.lib.services.compute.snapshots_client.' 'SnapshotsClient.show_snapshot') - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( module, return_value={})) self.assertFalse(self.client.is_resource_deleted('fake-id')) diff --git a/tempest/tests/lib/services/compute/test_versions_client.py b/tempest/tests/lib/services/compute/test_versions_client.py index 255a0a3d29..40d424f76c 100644 --- a/tempest/tests/lib/services/compute/test_versions_client.py +++ b/tempest/tests/lib/services/compute/test_versions_client.py @@ -14,7 +14,7 @@ import copy -from oslotest import mockpatch +import fixtures from tempest.lib.services.compute import versions_client from tempest.tests.lib import fake_auth_provider @@ -73,7 +73,7 @@ class TestVersionsClient(base.BaseServiceTest): 200) def _test_get_version_by_url(self, bytes_body=False): - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( "tempest.lib.common.rest_client.RestClient.token", return_value="Dummy Token")) params = {"version_url": self.versions_client._get_base_version_url()} diff --git a/tempest/tests/lib/services/compute/test_volumes_client.py b/tempest/tests/lib/services/compute/test_volumes_client.py index b81cdbbdeb..4b4f02ede3 100644 --- a/tempest/tests/lib/services/compute/test_volumes_client.py +++ b/tempest/tests/lib/services/compute/test_volumes_client.py @@ -14,7 +14,7 @@ import copy -from oslotest import mockpatch +import fixtures from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import volumes_client @@ -102,13 +102,13 @@ class TestVolumesClient(base.BaseServiceTest): def test_is_resource_deleted_true(self): module = ('tempest.lib.services.compute.volumes_client.' 'VolumesClient.show_volume') - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( module, side_effect=lib_exc.NotFound)) self.assertTrue(self.client.is_resource_deleted('fake-id')) def test_is_resource_deleted_false(self): module = ('tempest.lib.services.compute.volumes_client.' 'VolumesClient.show_volume') - self.useFixture(mockpatch.Patch( + self.useFixture(fixtures.MockPatch( module, return_value={})) self.assertFalse(self.client.is_resource_deleted('fake-id'))