Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5d158c authored by Ahmad Khalil's avatar Ahmad Khalil
Browse files

Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest 

Added @Flaky to:
1. onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration
2. vibrate_withOngoingRepeatingVibration_ignoresEffect
3. vibrate_withNewSameImportanceVibrationButOngoingIsRepeating_ignoreNewVibration
4. vibrate_withNewUnknownUsageVibrationAndNotRepeating_ignoreNewVibration

onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration's
failures were blocking presubmit.

Bug: 299481519
Test: N/A
Change-Id: If7c7a2c94db3eac4f4bc79a6c05c35683031a50c
parent 83adafdc

services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import android.view.HapticFeedbackConstants; 
import android.view.InputDevice;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;



import com.android.internal.app.IBatteryStats;

import com.android.internal.util.FrameworkStatsLog;
@@ -834,6 +835,7 @@ public class VibratorManagerServiceTest { 
                        eq(AudioAttributes.USAGE_UNKNOWN), anyInt(), anyString());

    }



    @FlakyTest

    @Test

    public void vibrate_withOngoingRepeatingVibration_ignoresEffect() throws Exception {

        mockVibrators(1);
@@ -920,6 +922,7 @@ public class VibratorManagerServiceTest { 
        cancelVibrate(service);  // Clean up repeating effect.

    }



    @FlakyTest

    @Test

    public void vibrate_withNewSameImportanceVibrationButOngoingIsRepeating_ignoreNewVibration()

            throws Exception {
@@ -973,6 +976,7 @@ public class VibratorManagerServiceTest { 
        cancelVibrate(service);  // Clean up repeating effect.

    }



    @FlakyTest

    @Test

    public void vibrate_withNewUnknownUsageVibrationAndNotRepeating_ignoreNewVibration()

            throws Exception {
@@ -1764,6 +1768,7 @@ public class VibratorManagerServiceTest { 
        cancelVibrate(service);  // Clean up long effect.

    }



    @FlakyTest

    @Test

    public void onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration()

            throws Exception {