diff options
| author | 2020-10-20 20:31:17 +0000 | |
|---|---|---|
| committer | 2020-10-20 20:31:17 +0000 | |
| commit | 29fda6ce519d8fbdefe46b98c6913181cdbd019b (patch) | |
| tree | 61c7ac3cd4b3e3ecce415227f2978a04785643d7 /tools/releasetools/test_common.py | |
| parent | 3dd40ccebeec9997ec61cb4ae7d3684c6417fe08 (diff) | |
| parent | b0c75911b84c4131d83674269621ff2f154f365d (diff) | |
Merge "Make merge_target_files more lenient, needed for cross-release merging."
Diffstat (limited to 'tools/releasetools/test_common.py')
| -rw-r--r-- | tools/releasetools/test_common.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/releasetools/test_common.py b/tools/releasetools/test_common.py index 22fc85adf1..ee28571878 100644 --- a/tools/releasetools/test_common.py +++ b/tools/releasetools/test_common.py @@ -1418,13 +1418,17 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase): def test_MergeDynamicPartitionInfoDicts_ReturnsMergedDict(self): framework_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a', 'dynamic_partition_list': 'system', 'super_group_a_partition_list': 'system', } vendor_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a group_b', 'dynamic_partition_list': 'vendor product', + 'super_block_devices': 'super', + 'super_super_device_size': '3000', 'super_group_a_partition_list': 'vendor', 'super_group_a_group_size': '1000', 'super_group_b_partition_list': 'product', @@ -1434,8 +1438,11 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase): framework_dict=framework_dict, vendor_dict=vendor_dict) expected_merged_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a group_b', - 'dynamic_partition_list': 'system vendor product', + 'dynamic_partition_list': 'product system vendor', + 'super_block_devices': 'super', + 'super_super_device_size': '3000', 'super_group_a_partition_list': 'system vendor', 'super_group_a_group_size': '1000', 'super_group_b_partition_list': 'product', @@ -1445,12 +1452,14 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase): def test_MergeDynamicPartitionInfoDicts_IgnoringFrameworkGroupSize(self): framework_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a', 'dynamic_partition_list': 'system', 'super_group_a_partition_list': 'system', 'super_group_a_group_size': '5000', } vendor_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a group_b', 'dynamic_partition_list': 'vendor product', 'super_group_a_partition_list': 'vendor', @@ -1462,8 +1471,9 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase): framework_dict=framework_dict, vendor_dict=vendor_dict) expected_merged_dict = { + 'use_dynamic_partitions': 'true', 'super_partition_groups': 'group_a group_b', - 'dynamic_partition_list': 'system vendor product', + 'dynamic_partition_list': 'product system vendor', 'super_group_a_partition_list': 'system vendor', 'super_group_a_group_size': '1000', 'super_group_b_partition_list': 'product', |