summaryrefslogtreecommitdiffstats
path: root/chromium/tools
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-04-29 09:22:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-29 09:22:19 +0000
commit91211061b2b94878b701a70dc94d456c3d5391f4 (patch)
treed96a500e82e413ab892d395369e1a8a54e727f0c /chromium/tools
parent98c49cd8d9e1ebba49e508ca516ece4f76753e3f (diff)
parent531e68a2b50a5e542eeede13907f29e463a99ebf (diff)
downloadandroid_frameworks_webview-91211061b2b94878b701a70dc94d456c3d5391f4.tar.gz
android_frameworks_webview-91211061b2b94878b701a70dc94d456c3d5391f4.tar.bz2
android_frameworks_webview-91211061b2b94878b701a70dc94d456c3d5391f4.zip
Merge "Revert "Stub out pause/ResumeTimers until b/8639231 is resolved."" into master-chromium
Diffstat (limited to 'chromium/tools')
-rwxr-xr-xchromium/tools/run_webview_cts.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/chromium/tools/run_webview_cts.py b/chromium/tools/run_webview_cts.py
index ef16ad5..217d662 100755
--- a/chromium/tools/run_webview_cts.py
+++ b/chromium/tools/run_webview_cts.py
@@ -46,8 +46,6 @@ EXPECTED_FAILURES = set([
'android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestAcceptAlways',
'android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestReject',
#'android.webkit.cts.GeolocationTest#testSimpleGeolocationRequestAcceptOnce',
- # Temporarily disabled, see b/8639231
- 'android.webkit.cts.WebViewTest#testPauseResumeTimers',
# Don't forget to update the spreadsheet! :)
])