Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02b1333 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Autodetect NetworkStack path in rollback test"

parents a3eb4278 ce4cad87

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java

+9 −2
Original line number Diff line number Diff line
@@ -77,8 +77,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.

tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java

+6 −1
Original line number Diff line number Diff line
@@ -139,7 +139,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);
@@ -188,4 +188,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");

    }

}