From ce4cad87d25600e5b1d8d47e191634e7894d7ebe Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 11 Nov 2019 12:47:25 +0900 Subject: [PATCH] Autodetect NetworkStack path in rollback test The network stack module may be implemented by NetworkStack (updatable version built against stable SDK) or NetworkStackNext (test version shipped only in system images, built against in-development SDK). Bug: 144168912 Test: atest RollbackTest Change-Id: I1788e323f763ca88b69b082f38078bee3bfe480d --- .../android/tests/rollback/StagedRollbackTest.java | 11 +++++++++-- .../tests/rollback/host/StagedRollbackTest.java | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java index 8b0193092d279..d39ed74b70cd1 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java @@ -79,8 +79,15 @@ public class StagedRollbackTest { private static final String MODULE_META_DATA_PACKAGE = getModuleMetadataPackageName(); private static final TestApp NETWORK_STACK = new TestApp("NetworkStack", - getNetworkStackPackageName(), -1, false, - new File("/system/priv-app/NetworkStack/NetworkStack.apk")); + getNetworkStackPackageName(), -1, false, findNetworkStackApk()); + + private static File findNetworkStackApk() { + final File apk = new File("/system/priv-app/NetworkStack/NetworkStack.apk"); + if (apk.isFile()) { + return apk; + } + return new File("/system/priv-app/NetworkStackNext/NetworkStackNext.apk"); + } /** * Adopts common shell permissions needed for rollback tests. diff --git a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java index 18a813d52b857..b5ce1ba4550e7 100644 --- a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java +++ b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java @@ -144,7 +144,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { + "watchdog_request_timeout_millis 300000"); // Simulate re-installation of new NetworkStack with rollbacks enabled getDevice().executeShellCommand("pm install -r --staged --enable-rollback " - + "/system/priv-app/NetworkStack/NetworkStack.apk"); + + getNetworkStackPath()); // Sleep to allow writes to disk before reboot Thread.sleep(5000); @@ -193,4 +193,9 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { lastPid = pid; } } + + private String getNetworkStackPath() throws Exception { + // Find the NetworkStack path (can be NetworkStack.apk or NetworkStackNext.apk) + return getDevice().executeShellCommand("ls /system/priv-app/NetworkStack*/*.apk"); + } }