Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build: (415 commits)
  Exclude perf-setup-sh from userdebug builds
  Reapply "Drop legacy vboot support."
  Revert "build: Enable super image build rules depending on single super block device"
  Version bump to BP3A.250905.014 [core/build_id.mk]
  Version bump to BP3A.250905.013 [core/build_id.mk]
  Version bump to BP3A.250905.012 [core/build_id.mk]
  Version bump to BP3A.250905.011 [core/build_id.mk]
  Version bump to BP3A.250905.007.W1 [core/build_id.mk]
  Version bump to BP3A.250905.005.X5 [core/build_id.mk]
  Add apexd.mainline_patch_level_2 to PRODUCT_PACKAGES
  Version bump to BP3A.250905.009 [core/build_id.mk]
  Version bump to BP3A.250905.008 [core/build_id.mk]
  Version bump to BP3A.250905.005.X4 [core/build_id.mk]
  Version bump to BP3A.250905.005.Y1 [core/build_id.mk]
  Version bump to BP3A.250905.007 [core/build_id.mk]
  Version bump to BP3A.250905.005.X3 [core/build_id.mk]
  Version bump to BP3A.250905.005.X2 [core/build_id.mk]
  Version bump to BP3A.250905.005.X1 [core/build_id.mk]
  Version bump to BP3A.250905.006 [core/build_id.mk]
  Version bump to BP3A.250905.005 [core/build_id.mk]
  ...

Change-Id: I84161b0f013eb40002a433053b9383240274e9ea

1 files changed, 14 insertions, 8 deletions

diff --git a/ci/optimized_targets_test.py b/ci/optimized_targets_test.py
index 2935c83cc5..fe6e80aaa5 100644
--- a/ci/optimized_targets_test.py
+++ b/ci/optimized_targets_test.py
@@ -198,26 +198,32 @@ class GeneralTestsOptimizerTest(fake_filesystem_unittest.TestCase):
     self._verify_soong_zip_commands(package_commands, ['module_1'])
 
   @mock.patch('subprocess.run')
-  def test_get_soong_dumpvars_fails_raises(self, subprocess_run):
+  def test_get_soong_dumpvars_fails_fallback(self, subprocess_run):
     subprocess_run.return_value = self._get_soong_vars_output(return_code=-1)
     optimizer = self._create_general_tests_optimizer()
     self._set_up_build_outputs(['test_mapping_module'])
 
-    with self.assertRaisesRegex(RuntimeError, 'Soong dumpvars failed!'):
-      targets = optimizer.get_build_targets()
+    targets = optimizer.get_build_targets()
+
+    expected_build_targets = set()
+    expected_build_targets.add('general-tests')
+    # When a failure happens, we return the target itself
+    self.assertSetEqual(targets, expected_build_targets)
 
   @mock.patch('subprocess.run')
-  def test_get_soong_dumpvars_bad_output_raises(self, subprocess_run):
+  def test_get_soong_dumpvars_bad_output_fallback(self, subprocess_run):
     subprocess_run.return_value = self._get_soong_vars_output(
         stdout='This output is bad'
     )
     optimizer = self._create_general_tests_optimizer()
     self._set_up_build_outputs(['test_mapping_module'])
 
-    with self.assertRaisesRegex(
-        RuntimeError, 'Error parsing soong dumpvars output'
-    ):
-      targets = optimizer.get_build_targets()
+    targets = optimizer.get_build_targets()
+
+    expected_build_targets = set()
+    expected_build_targets.add('general-tests')
+    # When a failure happens, we return the target itself
+    self.assertSetEqual(targets, expected_build_targets)
 
   def _create_general_tests_optimizer(self, build_context: BuildContext = None):
     if not build_context: