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

Unified Diff: chrome/test/data/extensions/api_test/webrequest/test_blocking.html

Issue 7635003: Attempt to fix hanging WebRequestBlocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ugh Created 9 years, 4 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
« no previous file with comments | « chrome/test/data/extensions/api_test/webrequest/framework.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/webrequest/test_blocking.html
diff --git a/chrome/test/data/extensions/api_test/webrequest/test_blocking.html b/chrome/test/data/extensions/api_test/webrequest/test_blocking.html
index c6bc1665714a3e64c9660e97d77d8de8e77ea122..87ac7ccc797fef97bf57806fa048bb76997d147e 100644
--- a/chrome/test/data/extensions/api_test/webrequest/test_blocking.html
+++ b/chrome/test/data/extensions/api_test/webrequest/test_blocking.html
@@ -1,6 +1,8 @@
<script src="framework.js">
</script>
<script>
+var pass = chrome.test.callbackPass;
+
// Constants as functions, not to be called until after runTests.
function getURLEchoUserAgent() {
return getServerURL('echoheader?User-Agent');
@@ -19,8 +21,8 @@ runTests([
method: "GET",
tabId: tabId,
type: "main_frame",
- url: getURL("complexLoad/a.html"),
- frameUrl: getURL("complexLoad/a.html")
+ url: getURL("complexLoad/b.html"),
+ frameUrl: getURL("complexLoad/b.html")
},
retval: {cancel: true}
},
@@ -28,7 +30,7 @@ runTests([
{ label: "onErrorOccurred",
event: "onErrorOccurred",
details: {
- url: getURL("complexLoad/a.html"),
+ url: getURL("complexLoad/b.html"),
fromCache: false,
error: "net::ERR_EMPTY_RESPONSE"
// Request to chrome-extension:// url has no IP.
@@ -40,8 +42,15 @@ runTests([
],
{}, // filter
["blocking"]);
- console.log("load canc: navigating to a");
- navigateAndWait(getURL("complexLoad/a.html"));
+ console.log("load canc: navigating to b");
+ navigateAndWait(getURL("complexLoad/b.html"), function() {
+ // Workaround for hanging test. For some reason, if we try to load
+ // a new URL in the current tab, it hangs on the buildbot.
+ // See http://crbug.com/91715
+ chrome.tabs.create({url: "about:blank"}, pass(function(tab) {
+ tabId = tab.id;
+ }));
+ });
},
// Navigates to a page with a blocking handler that redirects to a different
« no previous file with comments | « chrome/test/data/extensions/api_test/webrequest/framework.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698