diff options
author | Ricky Niu <rickyniu@google.com> | 2022-06-06 11:57:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-06 11:57:46 +0000 |
commit | a66a1658a3ff50f03f8d96f4f987bd9d8eb1bab6 (patch) | |
tree | f264df50590f77c449e824681d5f9626e9364ea4 | |
parent | 231b7ede27550998a3890354b32ea405ca94dfbf (diff) | |
parent | b209eb9bd3b23be46505941b6d8f7dfa93d922f9 (diff) | |
download | hal-android13-qpr2-s6-release.tar.gz |
usb: skip the not supported test cases am: dc227dfc89 am: b209eb9bd3android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/18696350
Change-Id: I3167cd8ce3bebcb93c8ffae6c00640fd44fd9ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java b/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java index 1a2e0b3f..d62ff6c2 100644 --- a/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java +++ b/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java @@ -19,9 +19,14 @@ package com.android.tests.usbport; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; import com.android.tradefed.log.LogUtil.CLog; +import com.android.tradefed.invoker.TestInformation; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; +import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; +import com.google.common.base.Strings; +import java.util.Arrays; +import java.util.HashSet; import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; @@ -34,8 +39,11 @@ import org.junit.runner.RunWith; public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { public static final String TAG = VtsAidlUsbHostTest.class.getSimpleName(); + private static final String HAL_SERVICE = "android.hardware.usb-service"; private static final long CONN_TIMEOUT = 5000; + private static boolean mHasService; + private ITestDevice mDevice; private AtomicBoolean mReconnected = new AtomicBoolean(false); @@ -44,13 +52,26 @@ public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { mDevice = getDevice(); } + @BeforeClassWithInfo + public static void beforeClassWithDevice(TestInformation testInfo) throws Exception { + String serviceFound = + testInfo.getDevice() + .executeShellCommand(String.format("ps -A | grep \"%s\"", HAL_SERVICE)) + .trim(); + mHasService = !Strings.isNullOrEmpty(serviceFound); + } + @Test public void testResetUsbPort() throws Exception { + Assume.assumeTrue( + String.format("The device doesn't have service %s", HAL_SERVICE), mHasService); Assert.assertNotNull("Target device does not exist", mDevice); - String portResult; - + String portResult, content; String deviceSerialNumber = mDevice.getSerialNumber(); + HashSet<String> noSupportCases = + new HashSet<>(Arrays.asList("No USB ports", + "There is no available reset USB port")); CLog.i("testResetUsbPort on device [%s]", deviceSerialNumber); @@ -74,8 +95,9 @@ public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { CLog.i("Invoke shell command [" + cmd + "]"); long startTime = System.currentTimeMillis(); portResult = mDevice.executeShellCommand(cmd); + content = portResult.trim(); - if (portResult != null && "No USB ports".equals(portResult.trim())) { + if (portResult != null && (noSupportCases.contains(content))) { CLog.i("portResult: %s", portResult); return; } |