From 1d507e38f09a3dcb409c9014c3d0639f44459d3d Mon Sep 17 00:00:00 2001
From: Atneya Nair <atneya@google.com>
Date: Fri, 30 Jun 2023 16:32:18 -0700
Subject: [PATCH] Mark FakeLatencyTracker as flaky

DeviceConfig callbacks often block indef and cause test module timeouts.

Add a test timeout for this class and mark them as flaky to take out of
presubmit.

TODO: 275746222 - don't rely on these callbacks, and instead mock/fake
the config, since it isn't related to what we are testing.

Bug: 287361279
Bug: 289392471
Merged-In: I603ebe0ceac23335248a8cdb299d52829b55536a
Change-Id: I603ebe0ceac23335248a8cdb299d52829b55536a
---
 .../SoundTriggerMiddlewareLoggingLatencyTest.java          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLoggingLatencyTest.java b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLoggingLatencyTest.java
index 6a1674b7df8e8..63b8e1710b507 100644
--- a/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLoggingLatencyTest.java
+++ b/services/tests/voiceinteractiontests/src/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLoggingLatencyTest.java
@@ -38,13 +38,16 @@ import android.os.BatteryStatsInternal;
 import android.os.Process;
 import android.os.RemoteException;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.internal.util.FakeLatencyTracker;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
@@ -52,8 +55,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 @RunWith(JUnit4.class)
+@FlakyTest(bugId = 275746222)
 public class SoundTriggerMiddlewareLoggingLatencyTest {
 
+    @Rule
+    public Timeout mGlobalTimeout = Timeout.seconds(30);
+
     private FakeLatencyTracker mLatencyTracker;
     @Mock
     private BatteryStatsInternal mBatteryStatsInternal;