From d992ae133a6f0341404047170a3e65bda1c259b6 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Fri, 19 Apr 2024 14:05:08 +0900 Subject: [PATCH] Move VPN hardware assumption check to the end of setup tearDown expect setUp is executed. So move VPN hardware assumption check after all the setUps Test: atest HostsideVpnTests Bug: 330070197 Change-Id: I671897764908dc0188bcb2aef7177f1e4d573a8f --- .../hostside/app/src/com/android/cts/net/hostside/VpnTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java index 0f86d78a13..8e7b3d4c6a 100755 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java @@ -257,7 +257,6 @@ public class VpnTest { @Before public void setUp() throws Exception { - assumeTrue(supportedHardware()); mNetwork = null; mTestContext = getInstrumentation().getContext(); mTargetContext = getInstrumentation().getTargetContext(); @@ -272,6 +271,7 @@ public class VpnTest { mDevice.waitForIdle(); mCtsNetUtils = new CtsNetUtils(mTestContext); mPackageManager = mTestContext.getPackageManager(); + assumeTrue(supportedHardware()); } @After