Commit f44321a3 authored by John Chen's avatar John Chen Committed by Commit Bot

[ChromeDriver] Fix eager page load strategy

Fix NavigationTracker::DetermineUnknownLoadingState method to check
for document.readyState == "interactive" in eager page load mode,
to prevent testEagerMode from being flaky.

Bug: 1025967
Change-Id: Id41825869b249fb19a80723fabc1fea3a3bcda23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1922972
Commit-Queue: John Chen <johnchen@chromium.org>
Reviewed-by: default avatarCaleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716461}
parent 0cfeb7ef
...@@ -214,7 +214,8 @@ Status NavigationTracker::DetermineUnknownLoadingState() { ...@@ -214,7 +214,8 @@ Status NavigationTracker::DetermineUnknownLoadingState() {
if (status.IsError() || !result->GetString("result.value", &ready_state)) { if (status.IsError() || !result->GetString("result.value", &ready_state)) {
return MakeNavigationCheckFailedStatus(status); return MakeNavigationCheckFailedStatus(status);
} }
if (ready_state == "complete") { if (ready_state == "complete" ||
(is_eager_ && ready_state == "interactive")) {
loading_state_ = kNotLoading; loading_state_ = kNotLoading;
} else { } else {
loading_state_ = kLoading; loading_state_ = kLoading;
......
...@@ -111,8 +111,6 @@ _OS_SPECIFIC_FILTER['mac'] = [ ...@@ -111,8 +111,6 @@ _OS_SPECIFIC_FILTER['mac'] = [
'MobileEmulationCapabilityTest.testTapElement', 'MobileEmulationCapabilityTest.testTapElement',
# https://bugs.chromium.org/p/chromium/issues/detail?id=946023 # https://bugs.chromium.org/p/chromium/issues/detail?id=946023
'ChromeDriverTest.testWindowFullScreen', 'ChromeDriverTest.testWindowFullScreen',
# https://bugs.chromium.org/p/chromium/issues/detail?id=1025967
'ChromeDriverTestWithCustomCapability.testEagerMode',
# https://bugs.chromium.org/p/chromium/issues/detail?id=1025981 # https://bugs.chromium.org/p/chromium/issues/detail?id=1025981
'ChromeDriverSiteIsolation.testCanClickOOPIF', 'ChromeDriverSiteIsolation.testCanClickOOPIF',
# https://bugs.chromium.org/p/chromium/issues/detail?id=1026018 # https://bugs.chromium.org/p/chromium/issues/detail?id=1026018
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment