Allow android tests to specify a mainline package name

Tests that run against mainline modules generally need to be built
twice: once for aosp (unsigned) and once for internal (signed).
The override_android_test rule is really useful for generating a
signed version of the unsigned test.

However, mainline tests need to use a MainlineTestModuleController
to only run tests on targets with the expected module. Since unsigned
and signed mainline modules have different package names, this means
the test config needs to be updated when overriding a test.

Add a new "mainline_package_name" argument so that android test rules
can update the targeted mainline package. Without this, the only way
to create a mainline package test is to instead use android_test, which
results in a lot of copy-pasta.

Test: added tests to soong
Test: manual, using a locally-modified RkpdAppUnitTest
Test: test_config_fixer_test.py
Change-Id: Idaffd63f225719a2bfda41018fda630b17db0080
This commit is contained in:
Seth Moore
2023-02-02 13:22:26 -08:00
parent 800f64078c
commit c6f4b532f3
4 changed files with 67 additions and 1 deletions

View File

@@ -23,6 +23,8 @@ from xml.dom import minidom
import test_config_fixer
from manifest import write_xml
sys.dont_write_bytecode = True
@@ -117,5 +119,39 @@ class OverwriteTestFileNameTest(unittest.TestCase):
self.assertEqual(expected, output.getvalue())
class OverwriteMainlineModulePackageNameTest(unittest.TestCase):
""" Unit tests for overwrite_mainline_module_package_name function """
test_config = (
'<?xml version="1.0" encoding="utf-8"?>\n'
'<configuration description="Runs some tests.">\n'
' <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">\n'
' <option name="test-file-name" value="foo.apk"/>\n'
' </target_preparer>\n'
' <test class="com.android.tradefed.testtype.AndroidJUnitTest">\n'
' <option name="package" value="com.android.foo"/>\n'
' <option name="runtime-hint" value="20s"/>\n'
' </test>\n'
' <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">\n'
' <option name="enable" value="true"/>\n'
' <option name="mainline-module-package-name" value="%s"/>\n'
' </object>\n'
'</configuration>\n')
def test_testappinstallsetup(self):
doc = minidom.parseString(self.test_config % ("com.android.old.package.name"))
test_config_fixer.overwrite_mainline_module_package_name(doc, "com.android.new.package.name")
output = io.StringIO()
test_config_fixer.write_xml(output, doc)
# Only the mainline module package name should be updated. Format the xml
# with minidom first to avoid mismatches due to trivial reformatting.
expected = io.StringIO()
write_xml(expected, minidom.parseString(self.test_config % ("com.android.new.package.name")))
self.maxDiff = None
self.assertEqual(expected.getvalue(), output.getvalue())
if __name__ == '__main__':
unittest.main(verbosity=2)