diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-02 15:45:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-02 15:45:24 +0000 |
| commit | 9ff9969a77db3c3eab3f66dc297a597cb7eb95e6 (patch) | |
| tree | 3926a846685f793c8c59b2475ed1611873f4bf47 | |
| parent | dde045149be8584dd164d1d278938e25c39ac38e (diff) | |
| parent | 92533d07f3d9a82f54da836652d252f15b280d4d (diff) | |
| download | cts-9ff9969a77db3c3eab3f66dc297a597cb7eb95e6.tar.gz | |
Merge "Fixes ProfileScheduledJobHostSideTest#testKeyValueBackupJobRunsSuccessfully CTS test" into snap-temp-L12200000957170757
| -rw-r--r-- | hostsidetests/backup/src/android/cts/backup/ProfileScheduledJobHostSideTest.java | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/hostsidetests/backup/src/android/cts/backup/ProfileScheduledJobHostSideTest.java b/hostsidetests/backup/src/android/cts/backup/ProfileScheduledJobHostSideTest.java index 874282bc457..7e046213900 100644 --- a/hostsidetests/backup/src/android/cts/backup/ProfileScheduledJobHostSideTest.java +++ b/hostsidetests/backup/src/android/cts/backup/ProfileScheduledJobHostSideTest.java @@ -61,6 +61,10 @@ public class ProfileScheduledJobHostSideTest extends BaseMultiUserBackupHostSide private static final int TIMEOUT_FOR_FULL_BACKUP_SECONDS = 5 * 60; // 5 minutes. private static final String JOB_SCHEDULER_RUN_COMMAND = "cmd jobscheduler run -f android"; + private static final String LOGCAT_BUFFER_SIZE_GET_COMMAND = + "logcat -g | grep -E -o '[0-9]*([[:space:]]KiB|[[:space:]]MiB)' | head -1"; + private static final String LOGCAT_BUFFER_SIZE_SET_COMMAND = "logcat -G "; + private static final String LOGCAT_MAX_BUFFER_SIZE = "16MiB"; private final BackupUtils mBackupUtils = getBackupUtils(); private ITestDevice mDevice; @@ -115,6 +119,14 @@ public class ProfileScheduledJobHostSideTest extends BaseMultiUserBackupHostSide // Install a new key value backup app. installPackageAsUser(KEY_VALUE_APK, profileUserId); + String previousBufferSize = mBackupUtils.executeShellCommandAndReturnOutput( + LOGCAT_BUFFER_SIZE_GET_COMMAND); + // Remove all whitespaces and non-visible characters + previousBufferSize = previousBufferSize.replaceAll("\\s+", ""); + + mBackupUtils.executeShellCommandSync( + LOGCAT_BUFFER_SIZE_SET_COMMAND + LOGCAT_MAX_BUFFER_SIZE); + // Force run k/v job. String startLog = mLogcatInspector.mark(TAG); int jobId = getJobIdForUser(KEY_VALUE_MIN_JOB_ID, profileUserId); @@ -126,6 +138,8 @@ public class ProfileScheduledJobHostSideTest extends BaseMultiUserBackupHostSide // Check job rescheduled. assertThat(isSystemJobScheduled(jobId, KEY_VALUE_JOB_NAME)).isTrue(); + + mBackupUtils.executeShellCommandSync(LOGCAT_BUFFER_SIZE_SET_COMMAND + previousBufferSize); } /** Stop the profile user and assert that the key value job is no longer scheduled. */ @@ -165,6 +179,14 @@ public class ProfileScheduledJobHostSideTest extends BaseMultiUserBackupHostSide installPackageAsUser(FULL_BACKUP_APK, profileUserId); mBackupUtils.backupNowAndAssertSuccessForUser(PACKAGE_MANAGER_SENTINEL, profileUserId); + String previousBufferSize = mBackupUtils.executeShellCommandAndReturnOutput( + LOGCAT_BUFFER_SIZE_GET_COMMAND); + // Remove all whitespaces and non-visible characters + previousBufferSize = previousBufferSize.replaceAll("\\s+", ""); + + mBackupUtils.executeShellCommandSync( + LOGCAT_BUFFER_SIZE_SET_COMMAND + LOGCAT_MAX_BUFFER_SIZE); + // Force run full backup job. String startLog = mLogcatInspector.mark(TAG); int jobId = getJobIdForUser(FULL_BACKUP_MIN_JOB_ID, profileUserId); @@ -176,6 +198,8 @@ public class ProfileScheduledJobHostSideTest extends BaseMultiUserBackupHostSide // Check job rescheduled. assertThat(isSystemJobScheduled(jobId, FULL_BACKUP_JOB_NAME)).isTrue(); + + mBackupUtils.executeShellCommandSync(LOGCAT_BUFFER_SIZE_SET_COMMAND + previousBufferSize); } /** Stop the profile user and assert that the full backup job is no longer scheduled. */ |