Merge "Fix flaky test for persistent notifications" into main

This commit is contained in:
Pawan Wagh
2024-07-03 15:14:25 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 1 deletions

View File

@@ -76,11 +76,13 @@ public class Enable16KbTest extends BaseHostJUnit4Test {
installTestApp();
// Enable developer option and switch to 16kb kernel and Check page size
getDevice().enableAdbRoot();
runTestAndWait(SWITCH_TO_16KB);
result = getDevice().executeShellCommand("getconf PAGE_SIZE");
assertEquals("16384", result.strip());
// switch back to 4kb kernel and check page size
getDevice().enableAdbRoot();
runTestAndWait(SWITCH_TO_4KB);
result = getDevice().executeShellCommand("getconf PAGE_SIZE");
assertEquals("4096", result.strip());

View File

@@ -68,6 +68,8 @@ public class Enable16KbDeviceTest {
throw new RuntimeException("failed to freeze device orientation", e);
}
mDevice.executeShellCommand("am start -a com.android.setupwizard.FOUR_CORNER_EXIT");
mDevice.waitForWindowUpdate(null, TIMEOUT);
mDevice.executeShellCommand("input keyevent KEYCODE_WAKEUP");
mDevice.executeShellCommand("wm dismiss-keyguard");
}
@@ -150,6 +152,7 @@ public class Enable16KbDeviceTest {
private void openPersistentNotification(String title) {
mDevice.openNotification();
mDevice.waitForWindowUpdate(null, TIMEOUT);
verifyTextOnScreen(title);
mDevice.wait(Until.findObject(By.text(title)), TIMEOUT).click();
mDevice.waitForWindowUpdate(null, TIMEOUT);