commit a9c18c0628b9df6c386c91bfb527ab9b13057d9a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 11 20:02:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 11 20:02:07 2023 +0000
tree a86752a6ba4d2c95917025b94c0061e9b3a3e11c
parent 562039f30676683586e0b717e01ff157181cb7d8
parent c71a1f0162336af462c4401331adeb5186916f90

Merge "Fix the reboot unlock in Boottime test." into main

src/com/android/performance/tests/BootTimeTest.java

diff --git a/src/com/android/performance/tests/BootTimeTest.java b/src/com/android/performance/tests/BootTimeTest.java
index ec9aa99..d8000f7 100644
--- a/src/com/android/performance/tests/BootTimeTest.java
+++ b/src/com/android/performance/tests/BootTimeTest.java
@@ -38,7 +38,6 @@
 import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
-import com.android.tradefed.result.CollectingTestListener;
 import com.android.tradefed.result.FailureDescription;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.InputStreamSource;
@@ -427,6 +426,9 @@
         mTestInfo = testInfo;
         long start = System.currentTimeMillis();
         listener.testRunStarted(mTestRunName, 1);
+        for (IMetricCollector collector : mCollectors) {
+            listener = collector.init(mInvocationContext, listener);
+        }
         try {
             try {
                 // Set the current date from the host in test device.
@@ -497,15 +499,17 @@
                         // setup the pin.
                         if (!mSkipPinSetup) {
                             mRunner = createRemoteAndroidTestRunner(SETUP_PIN_TEST);
-                            getDevice()
-                                    .runInstrumentationTests(mRunner, new CollectingTestListener());
+                            getDevice().runInstrumentationTests(mRunner, listener);
                         }
                         testSuccessiveBoots(true, listener);
                     } finally {
-                        try (InputStreamSource logcatData = mRebootLogcatReceiver.getLogcatData()) {
-                            listener.testLog(LOGCAT_UNLOCK_FILE, LogDataType.TEXT, logcatData);
+                        if (null != mRebootLogcatReceiver) {
+                            try (InputStreamSource logcatData =
+                                    mRebootLogcatReceiver.getLogcatData()) {
+                                listener.testLog(LOGCAT_UNLOCK_FILE, LogDataType.TEXT, logcatData);
+                            }
+                            mRebootLogcatReceiver.stop();
                         }
-                        mRebootLogcatReceiver.stop();
                         listener.testStarted(successiveBootUnlockTestId);
                         listener.testEnded(successiveBootUnlockTestId, successiveBootUnlockResult);
                     }
@@ -613,9 +617,6 @@
             throws DeviceNotAvailableException {
         CLog.v("Waiting for %d msecs before successive boots.", mBootDelayTime);
         getRunUtil().sleep(mBootDelayTime);
-        for (IMetricCollector collector : mCollectors) {
-            listener = collector.init(mInvocationContext, listener);
-        }
         for (int count = 0; count < mBootCount; count++) {
             getDevice().enableAdbRoot();
             // Property used for collecting the perfetto trace file on boot.
@@ -644,9 +645,6 @@
                         new TestDescription(
                                 testId, String.format("%s", SUCCESSIVE_BOOT_UNLOCK_TEST));
             }
-            if (mBootTimePerIteration) {
-                listener.testStarted(successiveBootIterationTestId);
-            }
             if (mGranularBootInfo || dismissPin) {
                 clearAndStartLogcat();
                 getRunUtil().sleep(5000);
@@ -701,7 +699,11 @@
             if (dismissPin) {
                 getRunUtil().sleep(2000);
                 mRunner = createRemoteAndroidTestRunner(UNLOCK_PIN_TEST);
-                getDevice().runInstrumentationTests(mRunner, new CollectingTestListener());
+                getDevice().runInstrumentationTests(mRunner, listener);
+            }
+
+            if (mBootTimePerIteration) {
+                listener.testStarted(successiveBootIterationTestId);
             }
 
             CLog.v("Waiting for %d msecs immediately after successive boot.", mAfterBootDelayTime);