Make RecreateSKPs bot fail if capturing SKPs fails + exclude failing page sets
Bug: skia:7348
Change-Id: I8dd6337d2efeb1aaa71ac41fcb82b9a22bbd7531
Reviewed-on: https://skia-review.googlesource.com/76220
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 62feaa9..10f1a29 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -99,7 +99,7 @@
# How many times the record_wpr binary should be retried.
RETRY_RECORD_WPR_COUNT = 5
# How many times the run_benchmark binary should be retried.
-RETRY_RUN_MEASUREMENT_COUNT = 5
+RETRY_RUN_MEASUREMENT_COUNT = 3
# Location of the credentials.json file in Google Storage.
CREDENTIALS_GS_PATH = 'playback/credentials/credentials.json'
@@ -290,7 +290,9 @@
'--page-set-name=%s' % page_set_basename,
'--page-set-base-dir=%s' % page_set_dir,
'--skp-outdir=%s' % TMP_SKP_DIR,
- '--also-run-disabled-tests'
+ '--also-run-disabled-tests',
+ # See skbug.com/7348
+ '--story-filter-exclude="(digg|worldjournal)"',
)
for _ in range(RETRY_RUN_MEASUREMENT_COUNT):
@@ -298,20 +300,16 @@
print '\n\n=======Capturing SKP of %s=======\n\n' % page_set
subprocess.check_call(' '.join(run_benchmark_cmd), shell=True)
except subprocess.CalledProcessError:
- # skpicture_printer sometimes fails with AssertionError but the
- # captured SKP is still valid. This is a known issue.
- pass
-
- # Rename generated SKP files into more descriptive names.
- try:
- self._RenameSkpFiles(page_set)
- # Break out of the retry loop since there were no errors.
- break
- except Exception:
# There was a failure continue with the loop.
traceback.print_exc()
print '\n\n=======Retrying %s=======\n\n' % page_set
time.sleep(10)
+ continue
+
+ # Rename generated SKP files into more descriptive names.
+ self._RenameSkpFiles(page_set)
+ # Break out of the retry loop since there were no errors.
+ break
else:
# If we get here then run_benchmark did not succeed and thus did not
# break out of the loop.