build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 2854823007: Move screenshot capture to Java-side.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/instrumentation/instrumentation_test_instance.py

Issue 2854823007: Move screenshot capture to Java-side. (Closed)

Patch Set: Move screenshot capture to Java-side. Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java ('K') | « base/test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java ('k') | build/android/pylib/instrumentation/instrumentation_test_instance_test.py » ('j') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py

diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py

index 2324fca1194d3efc8ad608b40abd5fc68e5ce898..84c840aa6ecc116daf35d91e49866ab1576c39a4 100644

--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py

+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -54,6 +54,7 @@ _CMDLINE_NAME_SEGMENT_RE = re.compile(

r' with(?:out)? \{[^\}]*\}')

_PICKLE_FORMAT_VERSION = 11

+FAILURE_SCREENSHOT_SUBDIR = 'screenshots'

class MissingSizeAnnotationError(test_exception.TestException):

def __init__(self, class_name):

@@ -653,6 +654,8 @@ class InstrumentationTestInstance(test_instance.TestInstance):

self._flags.append('--strict-mode=' + args.strict_mode)

if args.regenerate_goldens:

self._flags.append('--regenerate-goldens')

+ if args.gs_results_bucket:

jbudorick 2017/05/05 01:21:58 The logical connection here between gs_results_buc

mikecase (-- gone --) 2017/05/05 18:09:19 nope! You are correct!

+ self._flags.append('--screenshot-dir=%s' % FAILURE_SCREENSHOT_SUBDIR)

if args.test_arguments:

# --test-arguments is deprecated for gtests and is in the process of