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

Commit 7e2531b4 authored by Mike Yu's avatar Mike Yu
Browse files

Revert "Add RebootTargetPreparer for tests that require root permission" 

This reverts commit 37a894be.

Reason for revert: ShellStatusChecker has been disabled for mainline test mapping suites

Change-Id: Icdea8a27d25afff198d20e4e73dbb6541f282278
parent 7e9fd669

resolv_test_config_template.xml

+0 −7
Original line number Diff line number Diff line
@@ -21,13 +21,6 @@ 
<configuration description="Configuration for {MODULE} tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />



   <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated

        root/unroot, reboot the device to reset the crash counter in init service.

        See b/260180513 for more details.

   -->

   <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />



   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer" />

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

tests/resolv_gold_test_config.xml

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
<configuration description="Configuration for resolv gold tests">

   <option name="test-suite-tag" value="mts" />

   <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />



   <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated

        root/unroot, reboot the device to reset the crash counter in init service.

        See b/260180513 for more details.

   -->

   <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />



   <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />