Merge branch 'master' of https://gitee.com/kuanjay/test_xdevice

plugins/ohos/src/ohos/drivers/drivers.py

@@ -2278,8 +2278,8 @@ class JSUnitTestDriver(IDriver):
         tests_dict = dict()
         test_count = 0
         if suite_info:
-            LOG.debug("Suites info: %s" % suite_info)
             json_str = "".join(suite_info)
+            LOG.debug("Suites info: %s" % json_str)
             try:
                 suite_dict_list = json.loads(json_str).get("suites", [])
                 for suite_dict in suite_dict_list:

plugins/ohos/src/ohos/environment/device.py

@@ -80,7 +80,9 @@ def perform_device_action(func):
             except ReportException as error:
                 self.log.exception("Generate report error!", exc_info=False)
                 exception = error
-            except (ConnectionResetError, ConnectionRefusedError) as error:  # pylint:disable=undefined-variable
+            except (ConnectionResetError,              # pylint:disable=undefined-variable
+                    ConnectionRefusedError,            # pylint:disable=undefined-variable
+                    ConnectionAbortedError) as error:  # pylint:disable=undefined-variable
                 self.log.error("error type: %s, error: %s" %
                                (error.__class__.__name__, error))
                 cmd = "hdc_std target boot"

plugins/ohos/src/ohos/parser/parser.py

@@ -1245,8 +1245,14 @@ class OHJSUnitTestParser(IParser):
             if len(test_des_list) == len(report_listener.result[pos][1]):
                 continue
             interval = len(test_des_list) - len(report_listener.result[pos][1])
-            LOG.info("{} tests in {} had missed.".format(
-                interval, suite.suite_name))
+            if len(test_des_list) > 0:
+                LOG.info("{} tests in {} had missed.".format(
+                    interval, suite.suite_name))
+            else:
+                LOG.info("The count of tests in '{}' is incorrect! {} test "
+                         "form dry run and {} tests have run."
+                         "".format(suite.suite_name, len(test_des_list),
+                                   len(report_listener.result[pos][1])))
             for test_des in test_des_list:
                 is_contain = False
                 for case in report_listener.result[pos][1]:
@@ -1282,7 +1288,7 @@ class OHJSUnitTestParser(IParser):
                 suite_name_set.add(suite.suite_name)
             un_suite_set = all_suite_set.difference(suite_name_set)
             if un_suite_set:
-                LOG.info("{} suites had missed.".format(len(un_suite_set)))
+                LOG.info("{} suites have missed.".format(len(un_suite_set)))
         for name in un_suite_set:
             self.state_machine.running_test_index = 0
             test_des_list = self.runner.expect_tests_dict.get(

src/xdevice/_core/command/console.py

@@ -387,14 +387,15 @@ class Console(object):
             LOG.info("Input command: {}".format(args))
             para_list = args.split()
             argument = self.argument_parser(para_list)
-            if argument.options is None or not argument.valid_param:
+            options = argument.options
+            if options is None or not argument.valid_param:
                 LOG.warning("Options is None.")
                 return None
-            if argument.options.action == ToolCommandType.toolcmd_key_run and \
-                    argument.options.retry:
-                argument.options = self._get_retry_options(argument.options, argument.parser)
-                if argument.options.dry_run:
-                    history_report_path = getattr(argument.options,
+            if options.action == ToolCommandType.toolcmd_key_run and \
+                    options.retry:
+                options = self._get_retry_options(options, argument.parser)
+                if options.dry_run:
+                    history_report_path = getattr(options,
                                                   "history_report_path", "")
                     self._list_retry_case(history_report_path)
                     return
@@ -403,12 +404,12 @@ class Console(object):
                 SuiteReporter.clear_failed_case_list()
                 SuiteReporter.clear_report_result()
 
-            command = argument.options.action
+            command = options.action
             if command == "":
                 LOG.info("Command is empty.")
                 return
 
-            self._process_command(command, argument.options, para_list, argument.parser)
+            self._process_command(command, options, para_list, argument.parser)
         except (ParamError, ValueError, TypeError, SyntaxError,
                 AttributeError) as exception:
             error_no = getattr(exception, "error_no", "00000")
@@ -464,7 +465,8 @@ class Console(object):
         # modify history_command -rp param and -sn param
         for option_tuple in self._get_to_be_replaced_option(parser):
             history_command = self._replace_history_option(
-                history_command, (input_options, argument.options), option_tuple)
+                history_command, (input_options, argument.options),
+                option_tuple)
 
         # add history command to Scheduler.command_queue
         LOG.info("Retry command: %s", history_command)