diff options
| author | Julien Desprez <jdesprez@google.com> | 2024-02-22 05:38:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-22 05:38:36 +0000 |
| commit | c43967137ac1960915a77fbd294350f21523976b (patch) | |
| tree | c2b0f15c7f62a7c82aa8f6ddd90daeee3cba5b5f | |
| parent | 34f8fc807fa358354593a025bcb88b05bb751350 (diff) | |
| parent | 788a3b9e7c3b87d526bb55b78a1feda2f443283c (diff) | |
| download | suite_harness-c43967137ac1960915a77fbd294350f21523976b.tar.gz | |
Merge "Update TestStatus to new one" into main am: 788a3b9e7c
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/2972453
Change-Id: Ia6d54fa49cf090844c1dc49f22feefa2032f68a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 3 insertions, 3 deletions
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java index 9e8b57c2..b63acc4d 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java @@ -16,10 +16,10 @@ package com.android.compatibility.common.tradefed.result.suite; import com.android.compatibility.common.util.ChecksumReporter.ChecksumValidationException; -import com.android.ddmlib.testrunner.TestResult.TestStatus; import com.android.tradefed.result.TestDescription; import com.android.tradefed.result.TestResult; import com.android.tradefed.result.TestRunResult; +import com.android.tradefed.result.TestStatus; import com.google.common.annotations.VisibleForTesting; import com.google.common.hash.BloomFilter; diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java index 123572a8..391e4aa6 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java @@ -17,7 +17,6 @@ package com.android.compatibility.common.tradefed.targetprep; import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; -import com.android.ddmlib.testrunner.TestResult.TestStatus; import com.android.tradefed.config.IConfiguration; import com.android.tradefed.config.IConfigurationReceiver; import com.android.tradefed.config.Option; @@ -31,6 +30,7 @@ import com.android.tradefed.result.CollectingTestListener; import com.android.tradefed.result.TestDescription; import com.android.tradefed.result.TestResult; import com.android.tradefed.result.TestRunResult; +import com.android.tradefed.result.TestStatus; import com.android.tradefed.result.error.DeviceErrorIdentifier; import com.android.tradefed.result.error.InfraErrorIdentifier; import com.android.tradefed.targetprep.BuildError; @@ -161,7 +161,7 @@ public class ApkInstrumentationPreparer extends PreconditionPreparer TestRunResult result = listener.getCurrentRunResults(); for (Entry<TestDescription, TestResult> results : result.getTestResults().entrySet()) { - if (TestStatus.FAILURE.equals(results.getValue().getStatus())) { + if (TestStatus.FAILURE.equals(results.getValue().getResultStatus())) { if (mThrowError) { CLog.e( "Target preparation step %s failed.\n%s", |