commit 48a8f0d10b1d1b70c8e320d6489c58ab9b189fae
author Rahul Sabnis <rahulsabnis@google.com> Tue Apr 19 18:00:10 2022 -0700
committer Rahul Sabnis <rahulsabnis@google.com> Wed Apr 20 10:36:58 2022 -0700
tree cc4120cf8f8928e00a4b68f5f528d109529c39f1
parent 43c2dcaef609c4a268bfab6c95ed924af4ead6b1

Updates test_config_fixer to also work for SuiteApkInstaller

Bug: 228385580
Test: atest BluetoothInstrumentationTests
Merged-In: I878309354c4aa5a492fb3d2bcecf8b1410e011ee
Change-Id: I878309354c4aa5a492fb3d2bcecf8b1410e011ee

scripts/test_config_fixer.py

diff --git a/scripts/test_config_fixer.py b/scripts/test_config_fixer.py
index c150e8c..3dbc22e 100644
--- a/scripts/test_config_fixer.py
+++ b/scripts/test_config_fixer.py
@@ -28,6 +28,8 @@
 from manifest import parse_test_config
 from manifest import write_xml
 
+KNOWN_PREPARERS = ['com.android.tradefed.targetprep.TestAppInstallSetup',
+                   'com.android.tradefed.targetprep.suite.SuiteApkInstaller']
 
 def parse_args():
   """Parse commandline arguments."""
@@ -64,7 +66,7 @@
   tests = get_children_with_tag(test_config, 'target_preparer')
 
   for test in tests:
-    if test.getAttribute('class') == "com.android.tradefed.targetprep.TestAppInstallSetup":
+    if test.getAttribute('class') in KNOWN_PREPARERS:
       options = get_children_with_tag(test, 'option')
       for option in options:
         if option.getAttribute('name') == "test-file-name":