commit 7f77d241cf8197cd206e161da21fb00922c57697
author Julien Desprez <jdesprez@google.com> Mon Jan 30 16:24:23 2023 +0000
committer Julien Desprez <jdesprez@google.com> Wed Feb 08 00:20:32 2023 +0000
tree 7fbdc78a56843079156ea9db74fe31aede0834a4
parent c7da9cf73e260a0cccc8340c9c361a7213c5f264

Remove usage of FlakyTest annotation

We don't really use it. For now it's just causing a few issue with internal builds. Easier to remove and really fix the test.

Change-Id: I9c2217eb460a7233bbcb7d737682cf79b05d2e4d
Test: presubmit
Bug: None

javatests/com/android/tradefed/device/TestDeviceFuncTest.java

diff --git a/javatests/com/android/tradefed/device/TestDeviceFuncTest.java b/javatests/com/android/tradefed/device/TestDeviceFuncTest.java
index 2c7f4b8..854af8e 100644
--- a/javatests/com/android/tradefed/device/TestDeviceFuncTest.java
+++ b/javatests/com/android/tradefed/device/TestDeviceFuncTest.java
@@ -44,7 +44,6 @@
 import com.android.tradefed.util.ProcessInfo;
 import com.android.tradefed.util.RunUtil;
 import com.android.tradefed.util.StreamUtil;
-import android.platform.test.annotations.FlakyTest;
 
 import org.junit.Assume;
 import org.junit.Before;
@@ -665,7 +664,6 @@
     }
 
     /** Test device soft-restart detection API. */
-    @FlakyTest
     @Test
     public void testDeviceSoftRestart() throws DeviceNotAvailableException {
         CLog.i("testDeviceSoftRestartSince");