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

Issue 886993003: Revert #315148 "[Android] Convert ContentShellTest.apk to isolate." (Closed)

Created:
5 years, 10 months ago by Dirk Pranke
Modified:
5 years, 10 months ago
Reviewers:
jbudorick, M-A Ruel
CC:
chromium-reviews, mlamouri+watch-content_chromium.org, mkwst+moarreviews-shell_chromium.org, jam, darin-cc_chromium.org, yfriedman+watch_chromium.org, klundberg+watch_chromium.org, erikwright+watch_chromium.org, jbudorick+watch_chromium.org, jochen+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert #315148 "[Android] Convert ContentShellTest.apk to isolate." This reverts commit 4cf59ffaa830d5edad26a439ba13f07ce0447394. This patch appears to break the contentshell_instrumentation_tests on the chromium.webkit waterfall. I'm not sure what to do about this, as the .webkit tests appear to be run in a completely different way than the .linux (main waterfall) tests, but I'm reverting this for now and we can sort it out later. TBR=jbudorick@chromium.org, maruel@chromium.org BUG=400499 > Author: jbudorick <jbudorick@chromium.org>; > Date: Fri Feb 6 16:43:24 2015 -0800 > > [Android] Convert ContentShellTest.apk to isolate. > > We were previously using --test-data to push files from > //content/test/data/android/device_files to > $EXTERNAL_STORAGE/chrome/test/data/content. Switching to isolate lets > us handle all of our instrumentation and gtest data dependencies in the > same way. It will also facilitate using isolate to optimize transfers > between builders and testers. > > BUG=400499 > TBR=maruel@chromium.org > > Review URL: https://codereview.chromium.org/878163004 > > Cr-Commit-Position: refs/heads/master@{#315148} Committed: https://crrev.com/6aac98abee2bb3a1a1a3d6a526a417219dbc9375 Cr-Commit-Position: refs/heads/master@{#315220}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+14 lines, -270 lines) Patch
M base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java View 2 chunks +4 lines, -24 lines 0 comments Download
M build/android/pylib/instrumentation/setup.py View 1 chunk +4 lines, -4 lines 0 comments Download
M content/content_shell_test_apk.isolate View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java View 5 chunks +5 lines, -10 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java View 1 chunk +6 lines, -9 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java View 1 chunk +2 lines, -3 lines 0 comments Download
D content/test/data/android/content_detection/click_listeners.html View 1 chunk +0 lines, -26 lines 0 comments Download
D content/test/data/android/content_detection/email.html View 1 chunk +0 lines, -19 lines 0 comments Download
D content/test/data/android/content_detection/empty.html View 1 chunk +0 lines, -3 lines 0 comments Download
D content/test/data/android/content_detection/geo_address_limits.html View 1 chunk +0 lines, -25 lines 0 comments Download
D content/test/data/android/content_detection/geo_address_multiple.html View 1 chunk +0 lines, -19 lines 0 comments Download
D content/test/data/android/content_detection/geo_address_real.html View 1 chunk +0 lines, -20 lines 0 comments Download
D content/test/data/android/content_detection/geo_address_special_chars.html View 1 chunk +0 lines, -13 lines 0 comments Download
D content/test/data/android/content_detection/geo_address_split.html View 1 chunk +0 lines, -19 lines 0 comments Download
D content/test/data/android/content_detection/phone_international.html View 1 chunk +0 lines, -39 lines 0 comments Download
D content/test/data/android/content_detection/phone_local.html View 1 chunk +0 lines, -27 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/click_listeners.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/email.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/empty.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/geo_address_limits.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/geo_address_multiple.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/geo_address_real.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/geo_address_special_chars.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/geo_address_split.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/phone_international.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/content_detection/phone_local.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + content/test/data/android/device_files/geolocation.html View 0 chunks +-1 lines, --1 lines 0 comments Download
D content/test/data/android/geolocation.html View 1 chunk +0 lines, -17 lines 0 comments Download

Messages

Total messages: 5 (1 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/886993003/1
5 years, 10 months ago (2015-02-07 23:08:53 UTC) #2
Dirk Pranke
Link to the first build failure: https://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29/builds/24235 (it failed consistently after that).
5 years, 10 months ago (2015-02-07 23:10:46 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 10 months ago (2015-02-08 00:10:00 UTC) #4
commit-bot: I haz the power
5 years, 10 months ago (2015-02-08 00:10:39 UTC) #5
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/6aac98abee2bb3a1a1a3d6a526a417219dbc9375
Cr-Commit-Position: refs/heads/master@{#315220}

Powered by Google App Engine
This is Rietveld 408576698