Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1013)

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

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « build/android/pylib/instrumentation/setup.py ('k') | build/android/pylib/instrumentation/test_options.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/test_jar.py
diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py
index 7b97e59838c3d346a366fdf513157291f50a2e61..4473810e6202edddbcf384ecff2cb4dbe98a1904 100644
--- a/build/android/pylib/instrumentation/test_jar.py
+++ b/build/android/pylib/instrumentation/test_jar.py
@@ -14,6 +14,7 @@ import sys
from pylib import cmd_helper
from pylib import constants
from pylib.device import device_utils
+from pylib.utils import md5sum
from pylib.utils import proguard
sys.path.insert(0,
@@ -55,16 +56,6 @@ class TestJar(object):
if not self._GetCachedProguardData():
self._GetProguardData()
- @staticmethod
- def _CalculateMd5(path):
- # TODO(jbudorick): Move MD5sum calculations out of here and
- # AndroidCommands to their own module.
- out = cmd_helper.GetCmdOutput(
- [os.path.join(constants.GetOutDirectory(),
- 'md5sum_bin_host'),
- path])
- return out
-
def _GetCachedProguardData(self):
if (os.path.exists(self._pickled_proguard_name) and
(os.path.getmtime(self._pickled_proguard_name) >
@@ -74,7 +65,7 @@ class TestJar(object):
try:
with open(self._pickled_proguard_name, 'r') as r:
d = pickle.loads(r.read())
- jar_md5 = self._CalculateMd5(self._jar_path)
+ jar_md5 = md5sum.CalculateHostMd5Sums(self._jar_path)[0].hash
if (d['JAR_MD5SUM'] == jar_md5 and
d['VERSION'] == PICKLE_FORMAT_VERSION):
self._test_methods = d['TEST_METHODS']
@@ -114,7 +105,7 @@ class TestJar(object):
logging.info('Storing proguard output to %s', self._pickled_proguard_name)
d = {'VERSION': PICKLE_FORMAT_VERSION,
'TEST_METHODS': self._test_methods,
- 'JAR_MD5SUM': self._CalculateMd5(self._jar_path)}
+ 'JAR_MD5SUM': md5sum.CalculateHostMd5Sums(self._jar_path)[0].hash}
with open(self._pickled_proguard_name, 'w') as f:
f.write(pickle.dumps(d))
@@ -228,9 +219,8 @@ class TestJar(object):
int(v) for v in
device_utils.DeviceUtils.parallel().GetProp(
'ro.build.version.sdk').pGet(None)]
- tests = filter(
- lambda t: self._IsTestValidForSdkRange(t, min(sdk_versions)),
- tests)
+ tests = [t for t in tests
+ if self._IsTestValidForSdkRange(t, min(sdk_versions))]
return tests
« no previous file with comments | « build/android/pylib/instrumentation/setup.py ('k') | build/android/pylib/instrumentation/test_options.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698