Merge "Use unittest.mock instead of third party mock"

config_tempest/tests/base.py

@@ -15,10 +15,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
 import json
 import logging
-import mock
 from oslotest import base
 
 from config_tempest.clients import ClientManager

config_tempest/tests/services/test_aws.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.services.aws import Ec2Service
 from config_tempest.services.aws import S3Service

config_tempest/tests/services/test_base.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.services.base import Service
 from config_tempest.services.base import VersionedService

config_tempest/tests/services/test_compute.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.services.compute import ComputeService
 from config_tempest.tempest_conf import TempestConf

config_tempest/tests/services/test_horizon.py

@@ -14,9 +14,9 @@
 # under the License.
 
 from ssl import CertificateError
+from unittest import mock
 
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.services import horizon
 from config_tempest.tests.base import BaseConfigTempestTest

config_tempest/tests/services/test_identity.py

@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.services.identity import IdentityService
 from config_tempest.tempest_conf import TempestConf

config_tempest/tests/services/test_image.py

@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.services.image import ImageService
 from config_tempest.tempest_conf import TempestConf

config_tempest/tests/services/test_network.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.services.network import NetworkService
 from config_tempest.tempest_conf import TempestConf

config_tempest/tests/services/test_object_storage.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest import main
 from config_tempest.services.object_storage import ObjectStorageService

config_tempest/tests/services/test_services.py

@@ -15,7 +15,7 @@
 
 from config_tempest.services.services import Services
 from config_tempest.tests.base import BaseConfigTempestTest
-import mock
+from unittest import mock
 
 
 class TestServices(BaseConfigTempestTest):

config_tempest/tests/services/test_volume.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.services import volume
 from config_tempest.tempest_conf import TempestConf

config_tempest/tests/test_accounts.py

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import os
+from unittest import mock
 
 from config_tempest import accounts
 from config_tempest import main

config_tempest/tests/test_clients.py

@@ -15,8 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.clients import ClientManager
 from config_tempest.clients import ProjectsClient

config_tempest/tests/test_config_tempest.py

@@ -15,8 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.clients import ClientManager
 from config_tempest import main as tool

config_tempest/tests/test_credentials.py

@@ -15,8 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest.tests.base import BaseConfigTempestTest
 

config_tempest/tests/test_flavors.py

@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 from fixtures import MonkeyPatch
-import mock
 
 from config_tempest import constants as C
 from config_tempest.flavors import Flavors

config_tempest/tests/test_profile.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest import profile
 from config_tempest.tests.base import BaseConfigTempestTest

config_tempest/tests/test_tempest_conf.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest import tempest_conf
 from config_tempest.tests.base import BaseConfigTempestTest

config_tempest/tests/test_users.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from config_tempest.tests.base import BaseConfigTempestTest
 from config_tempest.users import Users