wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 943705 - Aggregate countdown timer in waitForPageLoad. r=mcomella

Browse Source
This commit is contained in:
Isura Edirisinghe 2014-04-30 14:11:31 -07:00
parent d372ad486f
commit abf9ea7438
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/tests/helpers/WaitHelper.java
View File

@ -100,17 +100,21 @@ public final class WaitHelper {
expecter.unregisterListener();
}
// The timeout wait time should be the aggregate time for all ChangeVerifiers.
final long verifierStartMillis = SystemClock.uptimeMillis();
// Verify remaining state has changed.
for (final ChangeVerifier verifier : pageLoadVerifiers) {
// If we timeout, either the state is set to the same value (which is fine), or
// the state has not yet changed. Since we can't be sure it will ever change, move
// on and let the assertions fail if applicable.
final int verifierWaitMillis = CHANGE_WAIT_MS - (int)(SystemClock.uptimeMillis() - verifierStartMillis);
final boolean hasTimedOut = !sSolo.waitForCondition(new Condition() {
@Override
public boolean isSatisfied() {
return verifier.hasStateChanged();
}
}, CHANGE_WAIT_MS);
}, verifierWaitMillis);
sContext.dumpLog(verifier.getLogTag(),
(hasTimedOut ? "timed out." : "was satisfied."));