cheets_CTS_N: count "not executed" in the retry/failure condition.
BUG=b:64095702
TEST=trybot
Change-Id: I9719c45f080e176be69b52c94820d7304c4b54fd
Reviewed-on: https://chromium-review.googlesource.com/599269
Commit-Ready: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
(cherry picked from commit 55f7ec77474bba1e397be65e3406440e78bbf6cd)
Reviewed-on: https://chromium-review.googlesource.com/602170
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
index e0a8f95..1d09937 100644
--- a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
+++ b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
@@ -399,7 +399,7 @@
retry_inconsistency_error = None
# If the results were not completed or were failing then continue or
# retry them iteratively MAX_RETRY times.
- while steps < self._max_retry and failed > waived:
+ while steps < self._max_retry and failed + notexecuted > waived:
steps += 1
with self._login_chrome(dont_override_profile=pushed_media):
self._ready_arc()
@@ -447,7 +447,7 @@
# The DUT has rebooted at this point and is in a clean state.
# Final classification of test results.
- if total_passed + waived == 0 or failed > waived:
+ if total_passed + waived == 0 or failed + notexecuted > waived:
raise error.TestFail(
'Failed: after %d retries giving up. '
'passed=%d, failed=%d, notexecuted=%d, waived=%d. %s' %
