build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1124763003: Update from https://crrev.com/327068

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 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 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

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 3f56e6d99f90007caf457e5eb3fde6b608afbecf..ccc0e728602042a8d5c8efeeef4889b20bfe6304 100644

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

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

@@ -335,7 +335,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

with open(pickle_path, 'r') as pickle_file:

pickle_data = pickle.loads(pickle_file.read())

- jar_md5, _ = md5sum.CalculateHostMd5Sums(jar_path)[0]

+ jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]

try:

if pickle_data['VERSION'] != _PICKLE_FORMAT_VERSION:

@@ -377,7 +377,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

if is_test_class(c)]

def _SaveTestsToPickle(self, pickle_path, jar_path, tests):

- jar_md5, _ = md5sum.CalculateHostMd5Sums(jar_path)[0]

+ jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]

pickle_data = {

'VERSION': _PICKLE_FORMAT_VERSION,

'JAR_MD5SUM': jar_md5,

« no previous file with comments | « build/android/pylib/host_driven/test_runner.py ('k') | build/android/pylib/instrumentation/test_jar.py » ('j') | mojo/public/tools/BUILD.gn » ('J')