Merge pull request #114 from bridadan/fix_htrun_version_lookup

Fix mbedhtrun --version number

Author: theotherjimmy

packages/mbed-host-tests/mbed_host_tests/mbedhtrun.py

@@ -17,9 +17,11 @@
 Author: Przemyslaw Wirkus <[email protected]>
 """
 
+from __future__ import print_function
 from multiprocessing import freeze_support
 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 mbed_os_tools.test.host_tests_toolbox.host_functional import handle_send_break_cmd
 
 
 def main():
@@ -28,18 +30,33 @@ def main():
              2. Call default test execution function run() to start test instrumentation
     """
     freeze_support()
-    result = 1
-    test_selector = DefaultTestSelector(init_host_test_cli_params())
-    try:
-        result = test_selector.execute()
-    except (KeyboardInterrupt, SystemExit):
-        test_selector.finish()
-        raise
+    result = 0
+    cli_params = init_host_test_cli_params()
+
+    if cli_params.version:         # --version
+        import pkg_resources    # part of setuptools
+        version = pkg_resources.require("mbed-host-tests")[0].version
+        print(version)
+    elif cli_params.send_break_cmd:  # -b with -p PORT (and optional -r RESET_TYPE)
+        handle_send_break_cmd(
+            port=cli_params.port,
+            disk=cli_params.disk,
+            reset_type=cli_params.forced_reset_type,
+            baudrate=cli_params.baud_rate,
+            verbose=cli_params.verbose
+        )
     else:
-        test_selector.finish()
-
-    # Ensure we don't return a negative value
-    if result < 0 or result > 255:
-        result = 1
+        test_selector = DefaultTestSelector(cli_params)
+        try:
+            result = test_selector.execute()
+            # Ensure we don't return a negative value
+            if result < 0 or result > 255:
+                result = 1
+        except (KeyboardInterrupt, SystemExit):
+            test_selector.finish()
+            result = 1
+            raise
+        else:
+            test_selector.finish()
 
     return result

src/mbed_os_tools/test/host_tests_runner/host_test_default.py

@@ -37,7 +37,6 @@
 from ..host_tests_logger import HtrunLogger
 from ..host_tests_conn_proxy import conn_process
 from ..host_tests_toolbox.host_functional import handle_send_break_cmd
-from ... import __version__
 if (sys.version_info > (3, 0)):
     from queue import Empty as QueueEmpty
 else:
@@ -82,18 +81,6 @@ def __init__(self, options):
                 host_tests_plugins.print_plugin_info()
                 sys.exit(0)
 
-            if options.version:         # --version
-                print(__version__)
-                sys.exit(0)
-
-            if options.send_break_cmd:  # -b with -p PORT (and optional -r RESET_TYPE)
-                handle_send_break_cmd(port=options.port,
-                    disk=options.disk,
-                    reset_type=options.forced_reset_type,
-                    baudrate=options.baud_rate,
-                    verbose=options.verbose)
-                sys.exit(0)
-
             if options.global_resource_mgr or options.fast_model_connection:
                 # If Global/Simulator Resource Mgr is working it will handle reset/flashing workflow
                 # So local plugins are offline