summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-04 19:04:16 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-04 19:04:16 +0000
commit6e8e6bdd05fbd91a25157c5f6c83e54d8e6369b3 (patch)
treed289ecd9e979418094e903fad945e4bd3c15ac25
parent10e0dc13a4d3842f93e7de8b41309f07ef5c63b0 (diff)
downloadchromium_src-6e8e6bdd05fbd91a25157c5f6c83e54d8e6369b3.zip
chromium_src-6e8e6bdd05fbd91a25157c5f6c83e54d8e6369b3.tar.gz
chromium_src-6e8e6bdd05fbd91a25157c5f6c83e54d8e6369b3.tar.bz2
Fix WebRequestEvents test flakiness.
Ignore type="other" webrequest events (like favicon fetches). BUG=78139 TEST=automated Review URL: http://codereview.chromium.org/6759079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80348 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/extensions/api_test/webrequest/events/test.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/data/extensions/api_test/webrequest/events/test.html b/chrome/test/data/extensions/api_test/webrequest/events/test.html
index dadce3f..72688d7 100644
--- a/chrome/test/data/extensions/api_test/webrequest/events/test.html
+++ b/chrome/test/data/extensions/api_test/webrequest/events/test.html
@@ -40,9 +40,10 @@ function checkExpectations() {
}
function captureEvent(name, details) {
- // Ignore system-level requests like safebrowsing updates since they are
- // unpredictable.
- if (details.tabId == -1)
+ // Ignore system-level requests like safebrowsing updates and favicon fetches
+ // since they are unpredictable.
+ if (details.tabId == -1 || details.type == "other" ||
+ details.url.match(/\/favicon.ico$/))
return;
delete details.requestId;