commit bbf58753f7e4e0346c1601ebc7480f2c0b991a29
author Nikita Ioffe <ioffe@google.com> Mon Sep 06 19:33:47 2021 +0100
committer Nikita Ioffe <ioffe@google.com> Mon Sep 06 19:34:38 2021 +0100
tree ccbb9f0373804f49e50eafb320ee7998f54ae919
parent 699456f825ac5adf328597784497ba94145667b2

Remove testStageActivateUninstallApexPackageWithUserspaceReboot

Test: presubmit
Bug: 197626983
Change-Id: I8b61a78bdf5de98203cb1a52720b13009a080a38

tests/src/com/android/tests/apex/ApexE2EBaseHostTest.java

diff --git a/tests/src/com/android/tests/apex/ApexE2EBaseHostTest.java b/tests/src/com/android/tests/apex/ApexE2EBaseHostTest.java
index e0871df..6203b9b 100644
--- a/tests/src/com/android/tests/apex/ApexE2EBaseHostTest.java
+++ b/tests/src/com/android/tests/apex/ApexE2EBaseHostTest.java
@@ -16,13 +16,11 @@
 
 package com.android.tests.apex;
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assume.assumeTrue;
 
 import android.cts.install.lib.host.InstallUtilsHost;
-import android.platform.test.annotations.RequiresDevice;
 
 import com.android.tests.rollback.host.AbandonSessionsRule;
 import com.android.tradefed.config.Option;
@@ -51,9 +49,6 @@
 
     private static final Duration BOOT_COMPLETE_TIMEOUT = Duration.ofMinutes(2);
 
-    private static final String USERSPACE_REBOOT_SUPPORTED_PROP =
-            "init.userspace_reboot.is_supported";
-
     // Protected so that derived tests can have access to test utils automatically
     protected final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);
 
@@ -85,21 +80,13 @@
 
     @Test
     public final void testStageActivateUninstallApexPackage()  throws Exception {
-        stageActivateUninstallApexPackage(false/*userspaceReboot*/);
+        stageActivateUninstallApexPackage();
     }
 
-    @Test
-    @RequiresDevice // TODO(b/147726967): Remove when Userspace reboot works on cuttlefish
-    public final void testStageActivateUninstallApexPackageWithUserspaceReboot()  throws Exception {
-        assumeTrue("Userspace reboot not supported on the device",
-                getDevice().getBooleanProperty(USERSPACE_REBOOT_SUPPORTED_PROP, false));
-        stageActivateUninstallApexPackage(true/*userspaceReboot*/);
-    }
-
-    private void stageActivateUninstallApexPackage(boolean userspaceReboot)  throws Exception {
+    private void stageActivateUninstallApexPackage()  throws Exception {
         ApexInfo apex = installApex(mApexFileName);
 
-        reboot(userspaceReboot); // for install to take affect
+        getDevice().reboot(); // for install to take affect
         Set<ApexInfo> activatedApexes = getDevice().getActiveApexes();
         assertWithMessage("Failed to activate %s", apex).that(activatedApexes).contains(apex);
 
@@ -125,25 +112,6 @@
         return testApexInfo;
     }
 
-    protected final void reboot(boolean userspaceReboot) throws Exception {
-        if (userspaceReboot) {
-            assertThat(getDevice().setProperty("test.userspace_reboot.requested", "1")).isTrue();
-            getDevice().rebootUserspace();
-        } else {
-            getDevice().reboot();
-        }
-        boolean success = getDevice().waitForBootComplete(BOOT_COMPLETE_TIMEOUT.toMillis());
-        assertWithMessage("Device didn't boot in %s", BOOT_COMPLETE_TIMEOUT).that(success).isTrue();
-        if (userspaceReboot) {
-            // If userspace reboot fails and fallback to hard reboot is triggered then
-            // test.userspace_reboot.requested won't be set.
-            boolean res = getDevice().getBooleanProperty("test.userspace_reboot.requested", false);
-            String message = "Userspace reboot failed, fallback to full reboot was triggered. ";
-            message += "Boot reason: " + getDevice().getProperty("sys.boot.reason.last");
-            assertWithMessage(message).that(res).isTrue();
-        }
-    }
-
     /**
      * Do some additional check, invoked by {@link #testStageActivateUninstallApexPackage()}.
      */