commit edf124780fceac9a0d9b018d8c360cdcb014e396
author Daniel Norman <danielnorman@google.com> Wed May 22 10:47:08 2019 -0700
committer Daniel Norman <danielnorman@google.com> Sat Jun 01 04:39:46 2019 +0000
tree dd9694d75da7ae9af0844f74c0d55243b006140e
parent cd56c0df95f2b4b275ad3c876a848cd2ce90a6d8

Adds validation check that certain partitions come from a single build.

This is to prevent a user from accidentally including files from the
wrong build. For example, adding any SYSTEM/ line to other_item_list
while keeping SYSTEM/* in system_item_list would cause the other build
to introduce an extra or changed file in the system image.

Bug: 132730710
Test: python -m unittest test_merge_target_files
Change-Id: Ic1178cdc9b991114f293ff3f2b4e6054e06647c6

tools/releasetools/test_merge_target_files.py

diff --git a/tools/releasetools/test_merge_target_files.py b/tools/releasetools/test_merge_target_files.py
index 1e29fde..978f679 100644
--- a/tools/releasetools/test_merge_target_files.py
+++ b/tools/releasetools/test_merge_target_files.py
@@ -19,9 +19,9 @@
 import common
 import test_utils
 from merge_target_files import (read_config_list, validate_config_lists,
-                                default_system_item_list,
-                                default_other_item_list,
-                                default_system_misc_info_keys, copy_items,
+                                DEFAULT_SYSTEM_ITEM_LIST,
+                                DEFAULT_OTHER_ITEM_LIST,
+                                DEFAULT_SYSTEM_MISC_INFO_KEYS, copy_items,
                                 merge_dynamic_partition_info_dicts,
                                 process_apex_keys_apk_certs_common)
 
@@ -101,35 +101,42 @@
     self.assertItemsEqual(system_item_list, expected_system_item_list)
 
   def test_validate_config_lists_ReturnsFalseIfMissingDefaultItem(self):
-    system_item_list = default_system_item_list[:]
+    system_item_list = list(DEFAULT_SYSTEM_ITEM_LIST)
     system_item_list.remove('SYSTEM/*')
     self.assertFalse(
-        validate_config_lists(system_item_list, default_system_misc_info_keys,
-                              default_other_item_list))
+        validate_config_lists(system_item_list, DEFAULT_SYSTEM_MISC_INFO_KEYS,
+                              DEFAULT_OTHER_ITEM_LIST))
 
   def test_validate_config_lists_ReturnsTrueIfDefaultItemInDifferentList(self):
-    system_item_list = default_system_item_list[:]
+    system_item_list = list(DEFAULT_SYSTEM_ITEM_LIST)
     system_item_list.remove('ROOT/*')
-    other_item_list = default_other_item_list[:]
+    other_item_list = list(DEFAULT_OTHER_ITEM_LIST)
     other_item_list.append('ROOT/*')
     self.assertTrue(
-        validate_config_lists(system_item_list, default_system_misc_info_keys,
+        validate_config_lists(system_item_list, DEFAULT_SYSTEM_MISC_INFO_KEYS,
                               other_item_list))
 
   def test_validate_config_lists_ReturnsTrueIfExtraItem(self):
-    system_item_list = default_system_item_list[:]
+    system_item_list = list(DEFAULT_SYSTEM_ITEM_LIST)
     system_item_list.append('MY_NEW_PARTITION/*')
     self.assertTrue(
-        validate_config_lists(system_item_list, default_system_misc_info_keys,
-                              default_other_item_list))
+        validate_config_lists(system_item_list, DEFAULT_SYSTEM_MISC_INFO_KEYS,
+                              DEFAULT_OTHER_ITEM_LIST))
+
+  def test_validate_config_lists_ReturnsFalseIfSharedExtractedPartition(self):
+    other_item_list = list(DEFAULT_OTHER_ITEM_LIST)
+    other_item_list.append('SYSTEM/my_system_file')
+    self.assertFalse(
+        validate_config_lists(DEFAULT_SYSTEM_ITEM_LIST,
+                              DEFAULT_SYSTEM_MISC_INFO_KEYS, other_item_list))
 
   def test_validate_config_lists_ReturnsFalseIfBadSystemMiscInfoKeys(self):
     for bad_key in ['dynamic_partition_list', 'super_partition_groups']:
-      system_misc_info_keys = default_system_misc_info_keys[:]
+      system_misc_info_keys = list(DEFAULT_SYSTEM_MISC_INFO_KEYS)
       system_misc_info_keys.append(bad_key)
       self.assertFalse(
-          validate_config_lists(default_system_item_list, system_misc_info_keys,
-                                default_other_item_list))
+          validate_config_lists(DEFAULT_SYSTEM_ITEM_LIST, system_misc_info_keys,
+                                DEFAULT_OTHER_ITEM_LIST))
 
   def test_merge_dynamic_partition_info_dicts_ReturnsMergedDict(self):
     system_dict = {