Mark ab/6881855 as merged
Bug: 172690556
Change-Id: Ie60b55cc3814d6868e107075bcc716570bfe6256
diff --git a/resources/device_config.common.ascii_proto b/resources/device_config.common.ascii_proto
index 0d4ae8a..d8c85cc 100644
--- a/resources/device_config.common.ascii_proto
+++ b/resources/device_config.common.ascii_proto
@@ -59,7 +59,7 @@
event {
source: "LOGCAT"
name: "assistant_started"
- regex: "START.*com\.google\.android\.googlequicksearchbox.*opa\.OpaActivity.*"
+ regex: "START.*com\.google\.android\.googlequicksearchbox.*opa\.OpaActivity.*|State changed: IDLE => FULL_LISTENING.*"
}
event {
diff --git a/resources/stress_test.dsp_trigger_and_screen_off.ascii_proto b/resources/stress_test.dsp_trigger_and_screen_off.ascii_proto
index 47241fb..567446b 100644
--- a/resources/stress_test.dsp_trigger_and_screen_off.ascii_proto
+++ b/resources/stress_test.dsp_trigger_and_screen_off.ascii_proto
@@ -29,7 +29,6 @@
assistant_started : 1
dsp_false_accept : 0
logcat_iteration : 1
- software_hotword : 1
speaker_id_rejected : 0
vis_software_hotword : 1
}
diff --git a/resources/stress_test.dsp_trigger_on_homescreen.ascii_proto b/resources/stress_test.dsp_trigger_on_homescreen.ascii_proto
index 2fef6be..b796215 100644
--- a/resources/stress_test.dsp_trigger_on_homescreen.ascii_proto
+++ b/resources/stress_test.dsp_trigger_on_homescreen.ascii_proto
@@ -17,7 +17,6 @@
assistant_started : 1
dsp_false_accept : 0
logcat_iteration : 1
- software_hotword : 1
speaker_id_rejected : 0
vis_software_hotword : 1
}
diff --git a/resources/stress_test.dsp_trigger_sw_rejection.ascii_proto b/resources/stress_test.dsp_trigger_sw_rejection.ascii_proto
index 10a230f..81d2e5f 100644
--- a/resources/stress_test.dsp_trigger_sw_rejection.ascii_proto
+++ b/resources/stress_test.dsp_trigger_sw_rejection.ascii_proto
@@ -48,8 +48,6 @@
assistant_started : 1
dsp_false_accept : 0
logcat_iteration : 1
- software_hotword : 2
- speaker_id_rejected : 1
vis_software_hotword : 2
}
diff --git a/stress_test.py b/stress_test.py
index 1576fbe..2ff487a 100644
--- a/stress_test.py
+++ b/stress_test.py
@@ -249,6 +249,7 @@
last_line = None
should_log = True
first_run = True
+ skip_exception_line = False
self.lock.acquire()
last_run_time = 0
while self.restart_process:
@@ -280,6 +281,10 @@
if last_line == line:
should_log = True
continue
+ elif skip_exception_line:
+ # ignore the last line which caused UnicodeEncodeError
+ skip_exception_line = False
+ continue
if self.output_fp:
self.output_fp.write(line.decode("utf-8", "backslashreplace").rstrip())
@@ -291,6 +296,9 @@
if self.looking:
event.ScanForEvent(line, lock=self.lock)
last_line = line
+ except UnicodeEncodeError:
+ logging.exception("UnicodeEncodeError on running logger process")
+ skip_exception_line = True
except: # pylint:disable=bare-except
logging.exception("Exception encountered running process")
finally:
@@ -300,6 +308,7 @@
self.process.send_signal(signal.SIGTERM)
should_log = False
self.lock.acquire()
+
self.lock.release()
if pexpect:
if self.process.exitstatus is not None:
