From ce5a03208258720287cbeb00e787ba20bbfa1db6 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Fri, 23 Feb 2024 15:01:38 -0800 Subject: [PATCH] Remove timeouts from CountdownLatch.await in tests --- .../embedding/engine/renderer/FlutterRendererTest.java | 5 ++--- .../flutter/scenarios/ExternalTextureFlutterActivity.java | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java index 146a1a8348667..50f83d5fb8e0a 100644 --- a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java +++ b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java @@ -27,7 +27,6 @@ import io.flutter.embedding.engine.FlutterJNI; import io.flutter.view.TextureRegistry; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Before; import org.junit.Test; @@ -263,8 +262,8 @@ public void run() { }); fakeFinalizer.start(); try { - latch.await(5L, TimeUnit.SECONDS); - } catch (Throwable e) { + latch.await(); + } catch (InterruptedException e) { // do nothing } } diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java index 1f01632cc4e4a..7a30a865fc856 100644 --- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java +++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java @@ -94,9 +94,7 @@ public void waitUntilFlutterRendered() { super.waitUntilFlutterRendered(); try { - if (!firstFrameLatch.await(10, java.util.concurrent.TimeUnit.SECONDS)) { - throw new RuntimeException("Timeout waiting for firstFrameLatch to signal"); - } + firstFrameLatch.await(); } catch (InterruptedException e) { throw new RuntimeException(e); }