Cleaning up paths

Author: bridadan

test/test/host_test_black_box.py

@@ -15,13 +15,9 @@
 # limitations under the License.
 
 import unittest
-import os
-import re
-from builtins import super
 from copy import copy
 from mbed_os_tools.test import init_host_test_cli_params
 from mbed_os_tools.test.host_tests_runner.host_test_default  import DefaultTestSelector
-from mock import patch, MagicMock
 
 from .mocks.environment.linux import MockTestEnvironmentLinux
 from .mocks.environment.darwin import MockTestEnvironmentDarwin
@@ -30,41 +26,38 @@
 mock_platform_info = {
     "platform_name": "K64F",
     "target_id": "0240000031754e45000c0018948500156461000097969900",
-    "mount_point": os.path.normpath("mnt/DAPLINK"),
-    "serial_port": os.path.normpath("dev/ttyACM0"),
+    "mount_point": "/mnt/DAPLINK",
+    "serial_port": "/dev/ttyACM0",
 }
-mock_image_path = os.path.normpath(
-    "BUILD/tests/K64F/GCC_ARM/TESTS/network/interface/interface.bin"
-)
+mock_image_path = "BUILD/tests/K64F/GCC_ARM/TESTS/network/interface/interface.bin"
 
 class BlackBoxHostTestTestCase(unittest.TestCase):
 
-    def test_host_test_linux(self):
-        with MockTestEnvironmentLinux(self, mock_platform_info, mock_image_path) as _env:
+    def _run_host_test(self, environment):
+        with environment as _env:
             test_selector = DefaultTestSelector(init_host_test_cli_params())
             result = test_selector.execute()
             test_selector.finish()
 
         self.assertEqual(result, 0)
 
-    def test_host_test_darwin(self):
-        with MockTestEnvironmentDarwin(self, mock_platform_info, mock_image_path) as _env:
-            test_selector = DefaultTestSelector(init_host_test_cli_params())
-            result = test_selector.execute()
-            test_selector.finish()
+    def test_host_test_linux(self):
+        self._run_host_test(
+            MockTestEnvironmentLinux(self, mock_platform_info, mock_image_path)
+        )
 
-        self.assertEqual(result, 0)
+    def test_host_test_darwin(self):
+        self._run_host_test(
+            MockTestEnvironmentDarwin(self, mock_platform_info, mock_image_path)
+        )
 
     def test_host_test_windows(self):
         win_mock_platform_info = copy(mock_platform_info)
-        win_mock_platform_info["mount_point"] = "D:"
         win_mock_platform_info["serial_port"] = "COM5"
-        with MockTestEnvironmentWindows(self, mock_platform_info, mock_image_path) as _env:
-            test_selector = DefaultTestSelector(init_host_test_cli_params())
-            result = test_selector.execute()
-            test_selector.finish()
 
-        self.assertEqual(result, 0)
+        self._run_host_test(
+            MockTestEnvironmentWindows(self, win_mock_platform_info, mock_image_path)
+        )
 
 if __name__ == '__main__':
     unittest.main()

test/test/mocks/environment/__init__.py

@@ -13,13 +13,20 @@ class MockTestEnvironment(object):
     def __init__(self, test_case, platform_info, image_path):
         self._test_case = test_case
         self._tempdir = tempfile.mkdtemp()
-        self._platform_info = copy(platform_info)
-        self._platform_info['mount_point'] = os.path.splitdrive(os.path.join(self._tempdir, self._platform_info['mount_point']))[1]
-        self._platform_info['serial_port'] =  os.path.splitdrive(os.path.join(self._tempdir, self._platform_info['serial_port']))[1]
-        self._image_path =  os.path.splitdrive(os.path.join(self._tempdir, image_path))[1]
-
         self._patch_definitions = []
         self.patches = {}
+        self._platform_info = copy(platform_info)
+
+        # Clean and retarget path to tempdir
+        self._image_path = self._clean_path(image_path)
+        self._platform_info['mount_point'] = self._clean_path(
+            self._platform_info['mount_point']
+        )
+
+        # Need to remove the drive letter in this case
+        self._platform_info['serial_port'] = os.path.splitdrive(
+            self._clean_path(self._platform_info['serial_port'])
+        )[1]
 
         args = (
             'mbedhtrun -m {} -p {}:9600 -f '
@@ -42,7 +49,7 @@ def __init__(self, test_case, platform_info, image_path):
         ]
         self.patch('mbed_os_tools.detect.create', new=detect_mock)
 
-        # Mock process
+        # Mock process calls and move them to threads to preserve mocks
         self.patch(
             'mbed_os_tools.test.host_tests_runner.host_test_default.Process',
             new=MagicMock(side_effect=self._process_side_effect)
@@ -52,14 +59,18 @@ def __init__(self, test_case, platform_info, image_path):
             new=MagicMock(return_value=0)
         )
 
-        # Mock serial
         mock_serial = MockSerial()
         mock_device = MockMbedDevice(mock_serial)
         self.patch(
             'mbed_os_tools.test.host_tests_conn_proxy.conn_primitive_serial.Serial',
             new=MagicMock(return_value=mock_serial)
         )
 
+    def _clean_path(self, path):
+        # Remove the drive letter and ensure separators are consistent
+        path = os.path.splitdrive(os.path.normpath(path))[1]
+        return os.path.join(self._tempdir, path.lstrip(os.sep))
+
     @staticmethod
     def _process_side_effect(target=None, args=None):
         return MockThread(target=target, args=args)

test/test/mocks/serial.py

@@ -19,7 +19,6 @@ def read(self, count):
     def write(self, data):
         self._tx_buffer += data
         if self._upstream_write_cb:
-            # TODO this may not work...
             self._upstream_write_cb(data)
 
     def close(self):

test/test/mocks/thread.py

@@ -5,7 +5,7 @@ class MockThread(Thread):
     def __init__(self, target=None, args=None):
         super().__init__(target=target, args=args)
         self._terminates = 0
-        self.exitcode = 0 # TODO maybe this needs to be setable? Mock sys.exit
+        self.exitcode = 0
 
     def terminate(self):
         self._terminates += 1