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

Author: claudiubelu

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