tests cleanup: Removes mock import checks

In Python 3, the mock module is now part of the unittest module.
We no longer support Python 2, so there's no reason for the import checks.

Change-Id: I7b4d68cba4b587ad9f0121058ba615a9bb0aec93

cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py

@@ -14,11 +14,7 @@
 
 import sys
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.metadata.services.osconfigdrive import factory
 

cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py

@@ -17,11 +17,7 @@
 import itertools
 import os
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception

cloudbaseinit/tests/metadata/services/test_azureservice.py

@@ -15,10 +15,7 @@
 import importlib
 import os
 import unittest
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception

cloudbaseinit/tests/metadata/services/test_base.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import requests
 import unittest
+import unittest.mock as mock
 
 from cloudbaseinit import exception
 from cloudbaseinit.metadata.services import base

cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py

@@ -16,11 +16,7 @@
 import importlib
 import os
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import exception
 from cloudbaseinit.metadata.services import baseconfigdrive

cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py

@@ -16,14 +16,10 @@
 import functools
 import posixpath
 import unittest
+import unittest.mock as mock
 
 import netaddr
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception
 from cloudbaseinit.metadata.services import base

cloudbaseinit/tests/metadata/services/test_cloudstack.py

@@ -15,13 +15,9 @@
 import functools
 import socket
 import unittest
+import unittest.mock as mock
 import urllib
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.metadata.services import cloudstack

cloudbaseinit/tests/metadata/services/test_configdrive.py

@@ -15,11 +15,7 @@
 
 import importlib
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.metadata.services import baseconfigdrive
 from cloudbaseinit.tests import testutils

cloudbaseinit/tests/metadata/services/test_ec2service.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.metadata.services import ec2service

cloudbaseinit/tests/metadata/services/test_gceservice.py

@@ -15,11 +15,7 @@
 import ddt
 import importlib
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.tests import testutils

cloudbaseinit/tests/metadata/services/test_httpservice.py

@@ -14,13 +14,9 @@
 
 import os
 import unittest
+import unittest.mock as mock
 from urllib import error
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.metadata.services import httpservice

cloudbaseinit/tests/metadata/services/test_maasservice.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception

cloudbaseinit/tests/metadata/services/test_nocloudservice.py

@@ -16,11 +16,7 @@
 import importlib
 import os
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.models import network as nm

cloudbaseinit/tests/metadata/services/test_opennebulaservice.py

@@ -16,11 +16,7 @@
 import re
 import textwrap
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.metadata.services import opennebulaservice

cloudbaseinit/tests/metadata/services/test_ovfservice.py

@@ -16,10 +16,7 @@
 import importlib
 import os
 import unittest
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.metadata.services import base

cloudbaseinit/tests/metadata/services/test_packet.py

@@ -14,13 +14,9 @@
 
 import importlib
 import unittest
+import unittest.mock as mock
 from urllib import error
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception
 from cloudbaseinit.tests import testutils

cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py

@@ -14,20 +14,15 @@
 
 import importlib
 import unittest
+import unittest.mock as mock
 
 import ddt
 
-from cloudbaseinit.utils import serialization
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception
 from cloudbaseinit.models import network as network_model
 from cloudbaseinit.tests import testutils
+from cloudbaseinit.utils import serialization
 
 
 CONF = cloudbaseinit_conf.CONF

cloudbaseinit/tests/metadata/test_factory.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import exception
 from cloudbaseinit.metadata import factory

cloudbaseinit/tests/osutils/test_base.py

@@ -15,11 +15,7 @@
 import subprocess
 import sys
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.osutils import base
 

cloudbaseinit/tests/osutils/test_factory.py

@@ -14,11 +14,7 @@
 
 import os
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.osutils import factory
 

cloudbaseinit/tests/osutils/test_windows.py

@@ -17,14 +17,10 @@
 import functools
 import importlib
 import os
+import unittest.mock as mock
 
 import netaddr
 
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
-
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception
 from cloudbaseinit.tests import fake

cloudbaseinit/tests/plugins/common/test_createuser.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit.plugins.common import base

cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import conf as cloudbaseinit_conf
 from cloudbaseinit import exception

cloudbaseinit/tests/plugins/common/test_execcmd.py

@@ -16,11 +16,7 @@
 import os
 import textwrap
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.plugins.common import base
 from cloudbaseinit.plugins.common import execcmd

cloudbaseinit/tests/plugins/common/test_fileexecutils.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.plugins.common import fileexecutils
 from cloudbaseinit.tests import testutils

cloudbaseinit/tests/plugins/common/test_localscripts.py

@@ -14,11 +14,7 @@
 
 import os
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.plugins.common import base
 from cloudbaseinit.plugins.common import localscripts

cloudbaseinit/tests/plugins/common/test_mtu.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.plugins.common import base
 from cloudbaseinit.plugins.common import mtu

cloudbaseinit/tests/plugins/common/test_networkconfig.py

@@ -15,11 +15,7 @@
 
 import functools
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit import exception
 from cloudbaseinit.models import network as network_model

cloudbaseinit/tests/plugins/common/test_ntpclient.py

@@ -13,11 +13,7 @@
 #    under the License.
 
 import unittest
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from cloudbaseinit.plugins.common import base
 from cloudbaseinit.plugins.common import ntpclient