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

Commit 69cd3886 authored by Dhavalkumar Chaudhary's avatar Dhavalkumar Chaudhary Committed by Android (Google) Code Review
Browse files

Merge "Increased Timeout duration to complete intent activity to avoid flaky tests" into main

parents 0518f206 30db597f

services/tests/powerstatstests/src/com/android/server/power/stats/BstatsCpuTimesValidationTest.java

+5 −9
Original line number Diff line number Diff line
@@ -92,19 +92,15 @@ public class BstatsCpuTimesValidationTest { 
    private static final int BATTERY_STATE_TIMEOUT_MS = 2000;

    private static final int BATTERY_STATE_CHECK_INTERVAL_MS = 200;



    private static final int START_ACTIVITY_TIMEOUT_MS = 2000;

    private static final int START_FG_SERVICE_TIMEOUT_MS = 2000;

    private static final int START_SERVICE_TIMEOUT_MS = 2000;

    private static final int START_ISOLATED_SERVICE_TIMEOUT_MS = 2000;



    private static final int SETTING_UPDATE_TIMEOUT_MS = 2000;

    private static final int SETTING_UPDATE_CHECK_INTERVAL_MS = 200;



    private static final int START_ACTIVITY_TIMEOUT_MS = 5000;

    private static final int START_FG_SERVICE_TIMEOUT_MS = 5000;

    private static final int START_SERVICE_TIMEOUT_MS = 5000;

    private static final int START_ISOLATED_SERVICE_TIMEOUT_MS = 5000;

    private static final int GENERAL_TIMEOUT_MS = 4000;

    private static final int GENERAL_INTERVAL_MS = 200;

    private static final int SCREEN_STATE_CHANGE_TIMEOUT_MS = 10000;



    private static final int WORK_DURATION_MS = 2000;

    private static final int WORK_DURATION_MS = 5000;



    private static boolean sBatteryStatsConstsUpdated;

    private static String sOriginalBatteryStatsConsts;

services/tests/powerstatstests/src/com/android/server/power/stats/CpuPowerStatsCollectorValidationTest.java

+2 −2
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ import java.util.regex.Pattern; 
@LargeTest

@android.platform.test.annotations.DisabledOnRavenwood(reason = "Integration test")

public class CpuPowerStatsCollectorValidationTest {

    private static final int WORK_DURATION_MS = 2000;

    private static final int WORK_DURATION_MS = 5000;

    private static final String TEST_PKG = "com.android.coretests.apps.bstatstestapp";

    private static final String TEST_ACTIVITY = TEST_PKG + ".TestActivity";

    private static final String EXTRA_KEY_CMD_RECEIVER = "cmd_receiver";

    private static final int START_ACTIVITY_TIMEOUT_MS = 2000;

    private static final int START_ACTIVITY_TIMEOUT_MS = 5000;



    private Context mContext;

    private UiDevice mUiDevice;