Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/251262
Change subject: Hygiene: increase test timeout ...................................................................... Hygiene: increase test timeout After disabling hardware acceleration on the app's WebView[0], test execution time increased by about a minute. This patch increases the timeout duration from one to five minutes and updates PageLoadTests to use TestLatch which has the appropriate constant built in. [0] https://gerrit.wikimedia.org/r/#/c/250366/ [1] https://integration.wikimedia.org/ci/job/apps-android-wikipedia-test/buildTimeTrend Change-Id: I62923003ed12a6972567290809ec088d093f76dc --- M app/src/androidTest/java/org/wikipedia/page/PageLoadTests.java M app/src/testlib/java/org/wikipedia/testlib/TestConstants.java 2 files changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/62/251262/1 diff --git a/app/src/androidTest/java/org/wikipedia/page/PageLoadTests.java b/app/src/androidTest/java/org/wikipedia/page/PageLoadTests.java index 598c5a6..022ce19 100644 --- a/app/src/androidTest/java/org/wikipedia/page/PageLoadTests.java +++ b/app/src/androidTest/java/org/wikipedia/page/PageLoadTests.java @@ -2,20 +2,17 @@ import org.wikipedia.Site; import org.wikipedia.history.HistoryEntry; +import org.wikipedia.testlib.TestLatch; import android.test.ActivityInstrumentationTestCase2; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; /** * Test loading of pages on a high level. Replacement for SectionFetchTaskTests. */ public class PageLoadTests extends ActivityInstrumentationTestCase2<PageActivity> { - private static final int TASK_COMPLETION_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30); private static final Site SITE = new Site("test.wikipedia.org"); private PageActivity activity; - private CountDownLatch completionLatch; + private TestLatch completionLatch; private PageFragment fragment; private PageLoadCallbacks callback = new PageLoadCallbacks() { @@ -49,7 +46,7 @@ } private void loadPage(final String title) throws Throwable { - completionLatch = new CountDownLatch(1); + completionLatch = new TestLatch(); getInstrumentation().runOnMainSync(new Runnable() { @Override public void run() { @@ -58,7 +55,7 @@ loadPage(fragment, title); } }); - assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, TimeUnit.MILLISECONDS)); + completionLatch.await(); } public static void loadPage(PageFragment fragment, String title) { diff --git a/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java b/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java index 7179736..027380b 100644 --- a/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java +++ b/app/src/testlib/java/org/wikipedia/testlib/TestConstants.java @@ -3,8 +3,8 @@ import java.util.concurrent.TimeUnit; public final class TestConstants { - public static final int TIMEOUT_DURATION = 60; - public static final TimeUnit TIMEOUT_UNIT = TimeUnit.SECONDS; + public static final int TIMEOUT_DURATION = 5; + public static final TimeUnit TIMEOUT_UNIT = TimeUnit.MINUTES; private TestConstants() { } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/251262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62923003ed12a6972567290809ec088d093f76dc Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
