diff options
| author | 2024-02-01 12:00:33 +0000 | |
|---|---|---|
| committer | 2024-02-01 12:00:33 +0000 | |
| commit | 96d2cf971ad5bb86f4134d1a6fbae7b5c4f68ac3 (patch) | |
| tree | 77b00db140b7375dbf490e19a69c6d1247732e1b | |
| parent | 3772f162b77e7365181ad93eb18e7f3db774b67c (diff) | |
| parent | 93d6263ad2cdbb24c4593c573ef763b03383eaf6 (diff) | |
Merge "Disable bugreport tests when onboarding flag is enabled" into main
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java b/services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java index 1c6d36b0a0d2..ea84eb2fbf73 100644 --- a/services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java +++ b/services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java @@ -36,6 +36,7 @@ import android.os.IBinder; import android.os.IDumpstateListener; import android.os.Process; import android.os.RemoteException; +import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; @@ -48,6 +49,7 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -118,6 +120,7 @@ public class BugreportManagerServiceImplTest { } @Test + @RequiresFlagsDisabled(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED) public void testBugreportFileManagerFileExists() { Pair<Integer, String> callingInfo = new Pair<>(mCallingUid, mCallingPackage); mBugreportFileManager.addBugreportFileForCaller( @@ -137,6 +140,7 @@ public class BugreportManagerServiceImplTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED) + @Ignore public void testBugreportFileManagerKeepFilesOnRetrieval() { Pair<Integer, String> callingInfo = new Pair<>(mCallingUid, mCallingPackage); mBugreportFileManager.addBugreportFileForCaller( @@ -150,6 +154,7 @@ public class BugreportManagerServiceImplTest { } @Test + @RequiresFlagsDisabled(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED) public void testBugreportFileManagerMultipleFiles() { Pair<Integer, String> callingInfo = new Pair<>(mCallingUid, mCallingPackage); mBugreportFileManager.addBugreportFileForCaller( |