prefer the newer mock from the Standard Library, when available

packages/mbed-greentea/test/mbed_gt_cmake_handlers.py

@@ -16,7 +16,10 @@
 """
 
 import os
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 import six
 import sys
 import unittest

packages/mbed-host-tests/test/conn_primitive_remote.py

@@ -16,7 +16,10 @@
 """
 
 import unittest
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 
 from mbed_host_tests.host_tests_conn_proxy.conn_primitive_remote import RemoteConnectorPrimitive
 

packages/mbed-host-tests/test/mps2_reset.py

@@ -16,7 +16,10 @@
 """
 
 import unittest
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 import os
 import time
 

test/test/conn_primitive_remote.py

@@ -14,7 +14,10 @@
 # limitations under the License.
 
 import unittest
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 
 from mbed_os_tools.test.host_tests_conn_proxy.conn_primitive_remote import RemoteConnectorPrimitive
 

test/test/mbed_gt_cmake_handlers.py

@@ -14,7 +14,10 @@
 # limitations under the License.
 
 import os
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 import six
 import sys
 import unittest

test/test/mbed_gt_greentea_dlm.py

@@ -20,7 +20,10 @@
 import unittest
 
 from lockfile import LockFile
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 from mbed_os_tools.test import mbed_greentea_dlm
 
 home_dir = tempfile.mkdtemp()

test/test/mbed_gt_hooks.py

@@ -17,7 +17,10 @@
 import sys
 import unittest
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 from mbed_os_tools.test.mbed_greentea_hooks import GreenteaCliTestHook
 from mbed_os_tools.test.mbed_greentea_hooks import LcovHook
 

test/test/mbed_gt_report_api.py

@@ -20,7 +20,10 @@
 import tempfile
 import unittest
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 from mbed_os_tools.test import mbed_report_api
 
 class GreenteaReportApiFunctionality(unittest.TestCase):

test/test/mbed_gt_target_info.py

@@ -20,7 +20,10 @@
 
 from six import StringIO
 
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 from mbed_os_tools.test import mbed_target_info
 
 

test/test/mbed_gt_test_api.py

@@ -15,8 +15,10 @@
 
 import unittest
 from mbed_os_tools.test import mbed_test_api
-from mock import patch, MagicMock
-
+try:
+    from unittest.mock import patch, MagicMock
+except ImportError:
+    from mock import patch, MagicMock
 
 class GreenteaTestAPI(unittest.TestCase):
 

test/test/mocks/environment/linux.py

@@ -1,6 +1,9 @@
 import os
 from builtins import super
-from mock import MagicMock
+try:
+    from unittest.mock import MagicMock
+except ImportError:
+    from mock import MagicMock
 
 from .posix import MockTestEnvironmentPosix
 

test/test/mps2_reset.py

@@ -14,7 +14,10 @@
 # limitations under the License.
 
 import unittest
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 import os
 import time
 

test/test/test_conn_primitive_serial.py

@@ -14,7 +14,10 @@
 # limitations under the License.
 
 import unittest
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 
 from mbed_os_tools.test.host_tests_conn_proxy.conn_primitive_serial import SerialConnectorPrimitive
 from mbed_os_tools.test.host_tests_conn_proxy.conn_primitive import ConnectorPrimitiveException

test/test/test_mbed_base.py

@@ -13,7 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import shutil
-import mock
+try:
+   from unittest import mock
+except ImportError
+   import mock
 import os
 import unittest
 from tempfile import mkdtemp