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

Commit d5369624 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Add RebootTargetPreparer for tests that require root permission am: 37a894be 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2323393



Change-Id: I159dfd6aaa36e25a2cb5405ae74af65a53c734fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9bb2540 37a894be

resolv_test_config_template.xml

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ 
<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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 
<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" />