Skip to content

Commit

Permalink
Revert of Re-enable prerender RemovingLink browser tests. (https://co…
Browse files Browse the repository at this point in the history 
…dereview.chromium.org/142013004/)

Reason for revert:
Failing on XP Tests 1, build 30187 and onwards.
Also failing on XP Tests 2 and 3.

[ RUN      ] PrerenderBrowserTest.PrerenderPageRemovingLinkWithTwoLinks
HTTP server started on 127.0.0.1:4080...
sending server_data: {"host": "127.0.0.1", "port": 4080} (35 bytes)
File not found prerender/prerender_page.html%E2%80%93)%C3%A4%C2%B3%C3%BBh%C3%BE)%C3%ACz%C2%BB full path:E:\b\build\slave\XP_Tests__1_\build\src\chrome/test/data\prerender\prerender_page.html%E2%80%93)%C3%A4%C2%B3%C3%BBh%C3%BE)%C3%ACz%C2%BB
127.0.0.1 - - [14/Feb/2014 22:17:53] code 404, message Not Found
[2656:2572:0214/221753:3777828:INFO:CONSOLE(1)] "Uncaught ReferenceError: DidPrerenderPass is not defined", source:  (1)

Original issue's description:
> Re-enable prerender RemovingLink browser tests.
> 
> The tests have changed significantly since they were first disabled. Add a
> WaitForStop or two for good measure, but leave them as-is for the most part.
> They can be disabled again if they still flake. Merge their custom prerender
> loader into the main one; it's mostly the same.
> 
> In addition, for better test coverage, add a new test which asserts on events
> received when a <link rel=prerender> is added for an existing prerender after
> that prerender has loaded. Significantly rework the prerender events logic
> to allow the test framework to wait on an event being received in the loader.
> 
> BUG=167340, 128841
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251495

TBR=mmenke@chromium.org,davidben@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=167340, 128841

Review URL: https://codereview.chromium.org/170173003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251732 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thestig@chromium.org committed Feb 18, 2014
1 parent ac2c0bc commit b53ac71
Show file tree
Hide file tree
Showing 6 changed files with 142 additions and 153 deletions.
131 changes: 59 additions & 72 deletions chrome/browser/prerender/prerender_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1280,46 +1280,56 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
return prerender_link_manager;
}

int GetPrerenderEventCount(int index, const std::string& type) const {
int event_count;
bool DidReceivePrerenderStartEventForLinkNumber(int index) const {
bool received_prerender_started;
std::string expression = base::StringPrintf(
"window.domAutomationController.send("
" GetPrerenderEventCount(%d, '%s'))", index, type.c_str());

CHECK(content::ExecuteScriptAndExtractInt(
GetActiveWebContents(), expression, &event_count));
return event_count;
}
"window.domAutomationController.send(Boolean("
"receivedPrerenderStartEvents[%d]))", index);

bool DidReceivePrerenderStartEventForLinkNumber(int index) const {
return GetPrerenderEventCount(index, "webkitprerenderstart") > 0;
CHECK(content::ExecuteScriptAndExtractBool(
GetActiveWebContents(),
expression,
&received_prerender_started));
return received_prerender_started;
}

int GetPrerenderLoadEventCountForLinkNumber(int index) const {
return GetPrerenderEventCount(index, "webkitprerenderload");
int load_event_count;
std::string expression = base::StringPrintf(
"window.domAutomationController.send("
"receivedPrerenderLoadEvents[%d] || 0)", index);

CHECK(content::ExecuteScriptAndExtractInt(
GetActiveWebContents(),
expression,
&load_event_count));
return load_event_count;
}

int GetPrerenderDomContentLoadedEventCountForLinkNumber(int index) const {
return GetPrerenderEventCount(index, "webkitprerenderdomcontentloaded");
}
int dom_content_loaded_event_count;
std::string expression = base::StringPrintf(
"window.domAutomationController.send("
"receivedPrerenderDomContentLoadedEvents[%d] || 0)", index);

bool DidReceivePrerenderStopEventForLinkNumber(int index) const {
return GetPrerenderEventCount(index, "webkitprerenderstop") > 0;
CHECK(content::ExecuteScriptAndExtractInt(
GetActiveWebContents(),
expression,
&dom_content_loaded_event_count));
return dom_content_loaded_event_count;
}

void WaitForPrerenderEventCount(int index,
const std::string& type,
int count) const {
int dummy;
bool DidReceivePrerenderStopEventForLinkNumber(int index) const {
bool received_prerender_stopped;
std::string expression = base::StringPrintf(
"WaitForPrerenderEventCount(%d, '%s', %d,"
" window.domAutomationController.send.bind("
" window.domAutomationController, 0))",
index, type.c_str(), count);
"window.domAutomationController.send(Boolean("
"receivedPrerenderStopEvents[%d]))", index);

CHECK(content::ExecuteScriptAndExtractInt(
GetActiveWebContents(), expression, &dummy));
CHECK_EQ(0, dummy);
CHECK(content::ExecuteScriptAndExtractBool(
GetActiveWebContents(),
expression,
&received_prerender_stopped));
return received_prerender_stopped;
}

bool HadPrerenderEventErrors() const {
Expand Down Expand Up @@ -1714,17 +1724,18 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovesPending) {
ASSERT_TRUE(IsEmptyPrerenderLinkManager());
}

IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovingLink) {
scoped_ptr<TestPrerender> prerender =
PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_CANCELLED, 1);
// Flaky, http://crbug.com/167340.
IN_PROC_BROWSER_TEST_F(
PrerenderBrowserTest, DISABLED_PrerenderPageRemovingLink) {
set_loader_path("files/prerender/prerender_loader_removing_links.html");
set_loader_query_and_fragment("?links_to_insert=1");
PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_CANCELLED, 1);

// No ChannelDestructionWatcher is needed here, since prerenders in the
// PrerenderLinkManager should be deleted by removing the links, rather than
// shutting down the renderer process.
RemoveLinkElement(0);
prerender->WaitForStop();

EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0));
EXPECT_FALSE(HadPrerenderEventErrors());
Expand All @@ -1734,56 +1745,23 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovingLink) {
EXPECT_TRUE(IsEmptyPrerenderLinkManager());
}

// Flaky, http://crbug.com/167340.
IN_PROC_BROWSER_TEST_F(
PrerenderBrowserTest, PrerenderPageRemovingLinkWithTwoLinks) {
PrerenderBrowserTest, DISABLED_PrerenderPageRemovingLinkWithTwoLinks) {
GetPrerenderManager()->mutable_config().max_link_concurrency = 2;
GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2;

set_loader_path("files/prerender/prerender_loader_removing_links.html");
set_loader_query_and_fragment("?links_to_insert=2");
scoped_ptr<TestPrerender> prerender =
PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_CANCELLED, 1);
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0));
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(1));

RemoveLinkElement(0);
RemoveLinkElement(1);
prerender->WaitForStop();

PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_CANCELLED, 1);
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0));
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(1));
EXPECT_FALSE(HadPrerenderEventErrors());
// IsEmptyPrerenderLinkManager() is not racy because the earlier DidReceive*
// calls did a thread/process hop to the renderer which insured pending
// renderer events have arrived.
EXPECT_TRUE(IsEmptyPrerenderLinkManager());
}

IN_PROC_BROWSER_TEST_F(
PrerenderBrowserTest, PrerenderPageRemovingLinkWithTwoLinksOneLate) {
GetPrerenderManager()->mutable_config().max_link_concurrency = 2;
GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2;

GURL url = test_server()->GetURL("files/prerender/prerender_page.html");
scoped_ptr<TestPrerender> prerender =
PrerenderTestURL(url, FINAL_STATUS_CANCELLED, 1);

// Add a second prerender for the same link. It reuses the prerender, so only
// the start event fires here.
AddPrerender(url, 1);
WaitForPrerenderEventCount(1, "webkitprerenderstart", 1);
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1));
EXPECT_EQ(0, GetPrerenderLoadEventCountForLinkNumber(1));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(1));

RemoveLinkElement(0);
RemoveLinkElement(1);
prerender->WaitForStop();

EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0));
EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0));
EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1));
Expand All @@ -1795,11 +1773,20 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_TRUE(IsEmptyPrerenderLinkManager());
}

#if defined(OS_WIN)
// TODO(gavinp): Fails on XP Rel - http://crbug.com/128841
#define MAYBE_PrerenderPageRemovingLinkWithTwoLinksRemovingOne \
DISABLED_PrerenderPageRemovingLinkWithTwoLinksRemovingOne
#else
#define MAYBE_PrerenderPageRemovingLinkWithTwoLinksRemovingOne \
PrerenderPageRemovingLinkWithTwoLinksRemovingOne
#endif // defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(
PrerenderBrowserTest,
PrerenderPageRemovingLinkWithTwoLinksRemovingOne) {
MAYBE_PrerenderPageRemovingLinkWithTwoLinksRemovingOne) {
GetPrerenderManager()->mutable_config().max_link_concurrency = 2;
GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2;
set_loader_path("files/prerender/prerender_loader_removing_links.html");
set_loader_query_and_fragment("?links_to_insert=2");
PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_USED, 1);
Expand Down
117 changes: 45 additions & 72 deletions chrome/test/data/prerender/prerender_events_common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,100 +10,73 @@
// Currently only errors with the ordering of Prerender events are caught.
var hadPrerenderEventErrors = false;

var receivedPrerenderEvents = {
'webkitprerenderstart': [],
'webkitprerenderdomcontentloaded': [],
'webkitprerenderload': [],
'webkitprerenderstop': [],
}
// A list of callbacks to be called on every prerender event. Each callback
// returns true if it should never be called again, or false to remain in the
// list and be called on future events. These are used to implement
// WaitForPrerenderEventCount.
var prerenderEventCallbacks = [];

function GetPrerenderEventCount(index, type) {
return receivedPrerenderEvents[type][index] || 0;
}

function PrerenderEventHandler(index, ev) {
// Check for errors.
if (ev.type == 'webkitprerenderstart') {
// No event may preceed start.
if (GetPrerenderEventCount(index, 'webkitprerenderstart') ||
GetPrerenderEventCount(index, 'webkitprerenderdomcontentloaded') ||
GetPrerenderEventCount(index, 'webkitprerenderload') ||
GetPrerenderEventCount(index, 'webkitprerenderstop')) {
hadPrerenderEventErrors = true;
}
} else {
// There may be multiple load or domcontentloaded events, but they must not
// come after start and must come before stop. And there may be at most one
// start. Note that stop may be delivered without any load events.
if (!GetPrerenderEventCount(index, 'webkitprerenderstart') ||
GetPrerenderEventCount(index, 'webkitprerenderstop')) {
hadPrerenderEventErrors = true;
}
var receivedPrerenderStartEvents = [];
var receivedPrerenderLoadEvents = [];
var receivedPrerenderDomContentLoadedEvents = [];
var receivedPrerenderStopEvents = [];

function PrerenderStartHandler(index) {
if (receivedPrerenderStartEvents[index] ||
receivedPrerenderLoadEvents[index] ||
receivedPrerenderStopEvents[index]) {
hadPrerenderEventErrors = true;
return;
}
receivedPrerenderStartEvents[index] = true;
}

// Update count.
receivedPrerenderEvents[ev.type][index] =
(receivedPrerenderEvents[ev.type][index] || 0) + 1;
function PrerenderLoadHandler(index) {
if (!receivedPrerenderStartEvents[index] ||
receivedPrerenderStopEvents[index]) {
hadPrerenderEventErrors = true;
return;
}
if (!receivedPrerenderLoadEvents[index])
receivedPrerenderLoadEvents[index] = 0;
receivedPrerenderLoadEvents[index]++;
}

// Run all callbacks. Remove the ones that are done.
prerenderEventCallbacks = prerenderEventCallbacks.filter(function(callback) {
return !callback();
});
function PrerenderDomContentLoadedHandler(index) {
if (!receivedPrerenderStartEvents[index] ||
receivedPrerenderStopEvents[index]) {
hadPrerenderEventErrors = true;
return;
}
if (!receivedPrerenderDomContentLoadedEvents[index])
receivedPrerenderDomContentLoadedEvents[index] = 0;
receivedPrerenderDomContentLoadedEvents[index]++;
}

// Calls |callback| when at least |count| instances of event |type| have been
// observed for prerender |index|.
function WaitForPrerenderEventCount(index, type, count, callback) {
var checkCount = function() {
if (GetPrerenderEventCount(index, type) >= count) {
callback();
return true;
}
return false;
};
if (!checkCount())
prerenderEventCallbacks.push(checkCount);
function PrerenderStopHandler(index) {
if (!receivedPrerenderStartEvents[index] ||
receivedPrerenderStopEvents[index]) {
hadPrerenderEventErrors = true;
return;
}
receivedPrerenderStopEvents[index] = true;
}

function AddEventHandlersToLinkElement(link, index) {
link.addEventListener('webkitprerenderstart',
PrerenderEventHandler.bind(null, index), false);
link.addEventListener('webkitprerenderdomcontentloaded',
PrerenderEventHandler.bind(null, index), false);
PrerenderStartHandler.bind(null, index), false);
link.addEventListener('webkitprerenderload',
PrerenderEventHandler.bind(null, index), false);
PrerenderLoadHandler.bind(null, index), false);
link.addEventListener('webkitprerenderdomcontentloaded',
PrerenderDomContentLoadedHandler.bind(null, index),
false);
link.addEventListener('webkitprerenderstop',
PrerenderEventHandler.bind(null, index), false);
PrerenderStopHandler.bind(null, index), false);
}

function AddPrerender(url, index) {
var link = document.createElement('link');
link.id = 'prerenderElement' + index;
link.rel = 'prerender';
link.href = url;
AddEventHandlersToLinkElement(link, index);
document.body.appendChild(link);
return link;
}

function RemoveLinkElement(index) {
var link = document.getElementById('prerenderElement' + index);
link.parentElement.removeChild(link);
}

function ExtractGetParameterBadlyAndInsecurely(param, defaultValue) {
var re = RegExp('[&?]' + param + '=([^&?#]*)');
var result = re.exec(document.location);
if (result)
return result[1];
return defaultValue;
}

function AddAnchor(href, target) {
var a = document.createElement('a');
a.href = href;
Expand Down
6 changes: 1 addition & 5 deletions chrome/test/data/prerender/prerender_loader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
</head>
<body>
<script>
var numLinksToInsert =
ExtractGetParameterBadlyAndInsecurely('links_to_insert', 1);
for (var i = 0; i < numLinksToInsert; ++i) {
AddPrerender('REPLACE_WITH_PRERENDER_URL', i);
}
AddPrerender('REPLACE_WITH_PRERENDER_URL', 0);
</script>
</body>
</html>
33 changes: 33 additions & 0 deletions chrome/test/data/prerender/prerender_loader_removing_links.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<html>
<head>
<title>Preloader</title>

<script src="prerender_events_common.js"></script>

<script>
function ExtractGetParameterBadlyAndInsecurely(param, defaultValue) {
var re = RegExp('[&?]' + param + '=([^&?#]*)');
var result = re.exec(document.location);
if (result)
return result[1];
return defaultValue;
}

var numLinksToInsert =
ExtractGetParameterBadlyAndInsecurely('links_to_insert', 1);

function RemoveLinkElement(index) {
var link = document.getElementById('prerenderElement' + index);
link.parentElement.removeChild(link);
}
</script>
</head>
<body>
<script>
for (var i = 0; i < numLinksToInsert; ++i) {
var link = AddPrerender('REPLACE_WITH_PRERENDER_URL', i);
link.id = 'prerenderElement' + i;
}
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion chrome/test/data/prerender/prerender_page_pending.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function DidPrerenderPass() {
pageWasPrerendered = true;
return !GetPrerenderEventCount(0, 'webkitprerenderstart');
return !receivedPrerenderStartEvents[0] && !receivedPrerenderStopEvents[0];
}

// Make sure DidPrerenderPass() was called first. Otherwise, the page was
Expand Down
Loading

0 comments on commit b53ac71

Please sign in to comment.