diff --git a/workspace_tools/host_tests/host_test.py b/workspace_tools/host_tests/host_test.py index 4dd16505a2..d11a40de4d 100644 --- a/workspace_tools/host_tests/host_test.py +++ b/workspace_tools/host_tests/host_test.py @@ -250,12 +250,15 @@ class Mbed: """ Copy file depending on method you want to use. Handles exception and return code from shell copy commands. """ + # image_path - Where is binary with target's firmware if copy_method is not None: - # image_path - Where is binary with target's firmware - result = host_tests_plugins.call_plugin('CopyMethod', copy_method, image_path=image_path, destination_disk=disk) + # We override 'default' method with 'shell' method + if copy_method == 'default': + copy_method = 'shell' else: - copy_method = 'default' - result = host_tests_plugins.call_plugin('CopyMethod', copy_method, image_path=image_path, destination_disk=disk) + copy_method = 'shell' + + result = host_tests_plugins.call_plugin('CopyMethod', copy_method, image_path=image_path, destination_disk=disk) return result; def flush(self): diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py b/workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py index 18fe0c42ae..14e88188bc 100644 --- a/workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py +++ b/workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py @@ -41,7 +41,7 @@ class HostTestPluginCopyMethod_Mbed(HostTestPluginBase): name = 'HostTestPluginCopyMethod_Mbed' type = 'CopyMethod' stable = True - capabilities = ['default'] + capabilities = ['shutil', 'default'] required_parameters = ['image_path', 'destination_disk'] def setup(self, *args, **kwargs): @@ -56,7 +56,8 @@ class HostTestPluginCopyMethod_Mbed(HostTestPluginBase): """ result = False if self.check_parameters(capabilitity, *args, **kwargs) is True: - if capabilitity == 'default': + # Capability 'default' is a dummy capability + if capability == 'shutil': image_path = kwargs['image_path'] destination_disk = kwargs['destination_disk'] # Wait for mount point to be ready