Update tests to work with mbed-os-tools package

Author: bridadan

legacy/mbed-ls/test/mbedls_toolsbase.py

@@ -58,8 +58,8 @@ def test_list_mbeds_valid_platform(self):
                                    'serial_port': 'not_valid'}]
         with patch("mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids") as _read_htm,\
              patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-             patch("mbed_lstools.lstools_base.PlatformDatabase.get") as _get,\
-             patch('os.listdir') as _listdir:
+             patch("mbed_os_tools.detect.platform_database.PlatformDatabase.get") as _get,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _mpr.return_value = True
             _read_htm.return_value = (u'0241BEEFDEAD', {})
             _get.return_value = {
@@ -82,8 +82,8 @@ def test_list_mbeds_invalid_tid(self):
                                    'serial_port': 'not_valid'}]
         with patch("mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids") as _read_htm,\
              patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-             patch("mbed_lstools.lstools_base.PlatformDatabase.get") as _get,\
-             patch('os.listdir') as _listdir:
+             patch("mbed_os_tools.detect.platform_database.PlatformDatabase.get") as _get,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _mpr.return_value = True
             _read_htm.side_effect = [(u'0241BEEFDEAD', {}), (None, {})]
             _get.return_value = {
@@ -103,10 +103,10 @@ def test_list_mbeds_invalid_platform(self):
                                    'target_id_usb_id': u'not_in_target_db',
                                    'serial_port': "dummy_serial_port"}]
         for qos in [FSInteraction.BeforeFilter, FSInteraction.AfterFilter]:
-            with patch("mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids") as _read_htm,\
-                patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-                patch("mbed_lstools.lstools_base.PlatformDatabase.get") as _get,\
-                patch('os.listdir') as _listdir:
+            with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._read_htm_ids") as _read_htm,\
+                patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+                patch("mbed_os_tools.detect.platform_database.PlatformDatabase.get") as _get,\
+                patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
                 _mpr.return_value = True
                 _read_htm.return_value = (u'not_in_target_db', {})
                 _get.return_value = None
@@ -122,8 +122,8 @@ def test_list_mbeds_unmount_mid_read(self):
         self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                    'target_id_usb_id': u'0240DEADBEEF',
                                    'serial_port': "dummy_serial_port"}]
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-             patch('os.listdir') as _listdir:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _mpr.return_value = True
             _listdir.side_effect = OSError
             to_check = self.base.list_mbeds()
@@ -134,9 +134,9 @@ def _test(mock):
             self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                        'target_id_usb_id': u'0240DEADBEEF',
                                        'serial_port': "dummy_serial_port"}]
-            with patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-                 patch('os.listdir') as _listdir,\
-                 patch('mbed_lstools.lstools_base.open', mock, create=True):
+            with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+                 patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir,\
+                 patch('mbed_os_tools.detect.lstools_base.open', mock, create=True):
                 _mpr.return_value = True
                 _listdir.return_value = ['MBED.HTM', 'DETAILS.TXT']
                 to_check = self.base.list_mbeds()
@@ -180,9 +180,9 @@ def _handle_open(*args, **kwargs):
                 return DEFAULT
 
         m = mock_open(read_data=details_txt_contents)
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-             patch('os.listdir') as _listdir,\
-             patch('mbed_lstools.lstools_base.open', m, create=True) as mocked_open:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir,\
+             patch('mbed_os_tools.detect.lstools_base.open', m, create=True) as mocked_open:
             mocked_open.side_effect = _handle_open
             _mpr.return_value = True
             _listdir.return_value = ['PRODINFO.HTM', 'DETAILS.TXT']
@@ -196,10 +196,10 @@ def _test(mock):
             self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                        'target_id_usb_id': u'0240DEADBEEF',
                                        'serial_port': "dummy_serial_port"}]
-            with patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-                 patch('os.listdir') as _listdir,\
-                 patch("mbed_lstools.lstools_base.MbedLsToolsBase._update_device_from_htm") as _htm,\
-                 patch('mbed_lstools.lstools_base.open', mock, create=True):
+            with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+                 patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir,\
+                 patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._update_device_from_htm") as _htm,\
+                 patch('mbed_os_tools.detect.lstools_base.open', mock, create=True):
                 _mpr.return_value = True
                 _htm.side_effect = None
                 _listdir.return_value = ['MBED.HTM', 'DETAILS.TXT']
@@ -220,8 +220,8 @@ def test_list_mbeds_unmount_mid_read_list_unmounted(self):
         self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                    'target_id_usb_id': u'0240DEADBEEF',
                                    'serial_port': "dummy_serial_port"}]
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as _mpr,\
-             patch('os.listdir') as _listdir:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as _mpr,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _mpr.return_value = True
             _listdir.side_effect = OSError
             to_check = self.base.list_mbeds()
@@ -277,7 +277,7 @@ def test_update_device_from_fs_mid_unmount(self):
             'mount_point': dummy_mount
         }
 
-        with patch('os.listdir') as _listdir:
+        with patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _listdir.side_effect = OSError
             self.base._update_device_from_fs(device, False)
             self.assertEqual(device['mount_point'], None)
@@ -305,8 +305,8 @@ def test_device_type_unmounted(self):
                                    'serial_port': "dummy_serial_port",
                                    'vendor_id': '0d28',
                                    'product_id': '0204'}]
-        with patch("mbed_lstools.lstools_base.PlatformDatabase.get") as _get,\
-             patch('os.listdir') as _listdir:
+        with patch("mbed_os_tools.detect.platform_database.PlatformDatabase.get") as _get,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _get.return_value = {
                 'platform_name': 'foo_target'
             }
@@ -327,7 +327,7 @@ def test_update_device_details_jlink(self):
             'mount_point': dummy_mount_point
         }
 
-        with patch('mbed_lstools.lstools_base.open', _open, create=True):
+        with patch('mbed_os_tools.detect.lstools_base.open', _open, create=True):
             device = deepcopy(base_device)
             device['directory_entries'] = ['Board.html', 'User Guide.html']
             self.base._update_device_details_jlink(device, False)
@@ -358,8 +358,8 @@ def test_fs_never(self):
             'serial_port': 'invalid_serial_port'
         }
         self.base.return_value = [device]
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase._update_device_from_fs") as _up_fs,\
-             patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as mount_point_ready:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._update_device_from_fs") as _up_fs,\
+             patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as mount_point_ready:
             mount_point_ready.return_value = True
 
             filter = None
@@ -396,10 +396,10 @@ def test_fs_after(self):
             'mount_point': 'invalid_mount_point',
             'serial_port': 'invalid_serial_port'
         }
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids") as _read_htm,\
-             patch("mbed_lstools.lstools_base.MbedLsToolsBase._details_txt") as _up_details,\
-             patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as mount_point_ready,\
-             patch('os.listdir') as _listdir:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._read_htm_ids") as _read_htm,\
+             patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._details_txt") as _up_details,\
+             patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as mount_point_ready,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             new_device_id = "00017531642046"
             _read_htm.return_value = (new_device_id, {})
             _listdir.return_value = ['mbed.htm', 'details.txt']
@@ -470,10 +470,10 @@ def test_fs_before(self):
             'mount_point': 'invalid_mount_point',
             'serial_port': 'invalid_serial_port'
         }
-        with patch("mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids") as _read_htm,\
-             patch("mbed_lstools.lstools_base.MbedLsToolsBase._details_txt") as _up_details,\
-             patch("mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready") as mount_point_ready,\
-             patch('os.listdir') as _listdir:
+        with patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._read_htm_ids") as _read_htm,\
+             patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase._details_txt") as _up_details,\
+             patch("mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready") as mount_point_ready,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             new_device_id = u'00017575430420'
             _read_htm.return_value = (new_device_id, {})
             _listdir.return_value = ['mbed.htm', 'details.txt']
@@ -552,7 +552,9 @@ def setUp(self):
         _open = mock_open(read_data=json.dumps(retarget_data))
 
         with patch('os.path.isfile') as _isfile,\
-             patch('mbed_lstools.lstools_base.open', _open, create=True):
+             patch('mbed_os_tools.detect.lstools_base.isfile') as _isfile,\
+             patch('mbed_os_tools.detect.lstools_base.open', _open, create=True):
+            _isfile.return_value = True
             self.base = DummyLsTools()
             _open.assert_called()
 
@@ -563,10 +565,10 @@ def test_list_mbeds_valid_platform(self):
         self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                    'target_id_usb_id': u'0240DEADBEEF',
                                    'serial_port': None}]
-        with patch('mbed_lstools.lstools_base.MbedLsToolsBase._read_htm_ids') as _read_htm,\
-             patch('mbed_lstools.lstools_base.MbedLsToolsBase.mount_point_ready') as _mpr,\
-             patch('mbed_lstools.lstools_base.PlatformDatabase.get') as _get,\
-             patch('os.listdir') as _listdir:
+        with patch('mbed_lstools.lstools_base.MbedDetectLsToolsBase._read_htm_ids') as _read_htm,\
+             patch('mbed_lstools.lstools_base.MbedDetectLsToolsBase.mount_point_ready') as _mpr,\
+             patch('mbed_os_tools.detect.platform_database.PlatformDatabase.get') as _get,\
+             patch("mbed_os_tools.detect.lstools_base.listdir") as _listdir:
             _mpr.return_value = True
             _read_htm.return_value = (u'0240DEADBEEF', {})
             _get.return_value = {

legacy/mbed-ls/test/os_linux_generic.py

@@ -93,9 +93,9 @@ def do_open(path, mode='r'):
         with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc,\
              patch('os.readlink') as _readlink,\
              patch('os.listdir') as _listdir,\
-             patch('mbed_lstools.linux.abspath') as _abspath,\
-             patch('mbed_lstools.linux.open', do_open) as _,\
-             patch('mbed_lstools.linux.isdir') as _isdir:
+             patch('os.path.abspath') as _abspath,\
+             patch('mbed_os_tools.detect.linux.open', do_open) as _,\
+             patch('os.path.isdir') as _isdir:
             _isdir.return_value = True
             _cliproc.return_value = (b'\n'.join(mount_list), None, 0)
             def do_readlink(link):