Commit d1243113 authored by bsheedy's avatar bsheedy Committed by Commit Bot

Add XR test workaround for loadUrl

Adds a workaround for an issue where loadUrl was returning before loaded
scripts finished executing during XR tests, causing test flakiness. The
workaround changes the condition being checked to include a check that
the function being polled actually exists.

Bug: 894796
Change-Id: I080345688a6a268b2dda656f39a7e91523b2cb95
Reviewed-on: https://chromium-review.googlesource.com/c/1306173Reviewed-by: default avatarLeszek Swirski <leszeks@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604308}
parent df4d1eaf
...@@ -395,9 +395,11 @@ public abstract class XrTestFramework { ...@@ -395,9 +395,11 @@ public abstract class XrTestFramework {
public int loadUrlAndAwaitInitialization(String url, int timeoutSec) public int loadUrlAndAwaitInitialization(String url, int timeoutSec)
throws InterruptedException { throws InterruptedException {
int result = mRule.loadUrl(url, timeoutSec); int result = mRule.loadUrl(url, timeoutSec);
// TODO(https://crbug.com/894796): Remove the first isInitializationComplete once loadUrl
// is fixed.
Assert.assertTrue("Timed out waiting for JavaScript test initialization", Assert.assertTrue("Timed out waiting for JavaScript test initialization",
pollJavaScriptBoolean("isInitializationComplete()", POLL_TIMEOUT_LONG_MS, pollJavaScriptBoolean("isInitializationComplete && isInitializationComplete()",
mRule.getWebContents())); POLL_TIMEOUT_LONG_MS, mRule.getWebContents()));
return result; return result;
} }
......
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