diff --git a/wlauto/instrumentation/trace_cmd/__init__.py b/wlauto/instrumentation/trace_cmd/__init__.py index 47296a80..b9c69814 100644 --- a/wlauto/instrumentation/trace_cmd/__init__.py +++ b/wlauto/instrumentation/trace_cmd/__init__.py @@ -233,6 +233,8 @@ class TraceCmdInstrument(Instrument): # Therefore timout for the pull command must also be adjusted # accordingly. self._pull_timeout = (self.stop_time - self.start_time) # pylint: disable=attribute-defined-outside-init + if self._pull_timeout < 60: + self._pull_timeout = 60 self.device.pull_file(self.output_file, context.output_directory, timeout=self._pull_timeout) context.add_iteration_artifact('bintrace', OUTPUT_TRACE_FILE, kind='data', description='trace-cmd generated ftrace dump.') diff --git a/wlauto/utils/trace_cmd.py b/wlauto/utils/trace_cmd.py index 37ce1fb9..1fbd627c 100644 --- a/wlauto/utils/trace_cmd.py +++ b/wlauto/utils/trace_cmd.py @@ -177,7 +177,7 @@ def sched_switch_parser(event, text): """ Sched switch output may be presented in a couple of different formats. One is handled by a regex. The other format can *almost* be handled by the default parser, if it - weren't for the ``==>`` that appers in the middle. + weren't for the ``==>`` that appears in the middle. """ if text.count('=') == 2: # old format regex = re.compile( @@ -187,7 +187,7 @@ def sched_switch_parser(event, text): ) parser_func = regex_body_parser(regex) return parser_func(event, text) - else: # three are more than two "=" -- new format + else: # there are more than two "=" -- new format return default_body_parser(event, text.replace('==>', ''))