commit 6022545272a7360f7faa5e00ad0e7a8f5ed9d5c3
author Greg Kaiser <gkaiser@google.com> Sat May 09 00:30:33 2020 +0000
committer Greg Kaiser <gkaiser@google.com> Sat May 09 00:30:33 2020 +0000
tree 5379ba075d12279081fce1556ff1b33c19155d77
parent b21e48b499850bfb5ac9e6e155ed96e8e724c5c0

Revert "Add a wrapper class PartitionBuildProp"

Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: Ie846d23b9f5c3325d021236725826512be7a3c78

tools/releasetools/test_ota_from_target_files.py

diff --git a/tools/releasetools/test_ota_from_target_files.py b/tools/releasetools/test_ota_from_target_files.py
index e007863..38faf64 100644
--- a/tools/releasetools/test_ota_from_target_files.py
+++ b/tools/releasetools/test_ota_from_target_files.py
@@ -108,58 +108,55 @@
 
 
 class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
+
   TEST_TARGET_INFO_DICT = {
-      'build.prop': common.PartitionBuildProps.FromDictionary(
-          'system', {
-              'ro.product.device': 'product-device',
-              'ro.build.fingerprint': 'build-fingerprint-target',
-              'ro.build.version.incremental': 'build-version-incremental-target',
-              'ro.build.version.sdk': '27',
-              'ro.build.version.security_patch': '2017-12-01',
-              'ro.build.date.utc': '1500000000'}
-      )
+      'build.prop' : {
+          'ro.product.device' : 'product-device',
+          'ro.build.fingerprint' : 'build-fingerprint-target',
+          'ro.build.version.incremental' : 'build-version-incremental-target',
+          'ro.build.version.sdk' : '27',
+          'ro.build.version.security_patch' : '2017-12-01',
+          'ro.build.date.utc' : '1500000000',
+      },
   }
 
   TEST_SOURCE_INFO_DICT = {
-      'build.prop': common.PartitionBuildProps.FromDictionary(
-          'system', {
-              'ro.product.device': 'product-device',
-              'ro.build.fingerprint': 'build-fingerprint-source',
-              'ro.build.version.incremental': 'build-version-incremental-source',
-              'ro.build.version.sdk': '25',
-              'ro.build.version.security_patch': '2016-12-01',
-              'ro.build.date.utc': '1400000000'}
-      )
+      'build.prop' : {
+          'ro.product.device' : 'product-device',
+          'ro.build.fingerprint' : 'build-fingerprint-source',
+          'ro.build.version.incremental' : 'build-version-incremental-source',
+          'ro.build.version.sdk' : '25',
+          'ro.build.version.security_patch' : '2016-12-01',
+          'ro.build.date.utc' : '1400000000',
+      },
   }
 
   TEST_INFO_DICT_USES_OEM_PROPS = {
-      'build.prop': common.PartitionBuildProps.FromDictionary(
-          'system', {
-              'ro.product.name': 'product-name',
-              'ro.build.thumbprint': 'build-thumbprint',
-              'ro.build.bar': 'build-bar'}
-      ),
-      'vendor.build.prop': common.PartitionBuildProps.FromDictionary(
-          'vendor', {
-               'ro.vendor.build.fingerprint': 'vendor-build-fingerprint'}
-      ),
-      'property1': 'value1',
-      'property2': 4096,
-      'oem_fingerprint_properties': 'ro.product.device ro.product.brand',
+      'build.prop' : {
+          'ro.product.name' : 'product-name',
+          'ro.build.thumbprint' : 'build-thumbprint',
+          'ro.build.bar' : 'build-bar',
+      },
+      'vendor.build.prop' : {
+          'ro.vendor.build.fingerprint' : 'vendor-build-fingerprint',
+      },
+      'property1' : 'value1',
+      'property2' : 4096,
+      'oem_fingerprint_properties' : 'ro.product.device ro.product.brand',
   }
 
   TEST_OEM_DICTS = [
       {
-          'ro.product.brand': 'brand1',
-          'ro.product.device': 'device1',
+          'ro.product.brand' : 'brand1',
+          'ro.product.device' : 'device1',
       },
       {
-          'ro.product.brand': 'brand2',
-          'ro.product.device': 'device2',
+          'ro.product.brand' : 'brand2',
+          'ro.product.device' : 'device2',
       },
       {
-          'ro.product.brand': 'brand3',
-          'ro.product.device': 'device3',
+          'ro.product.brand' : 'brand3',
+          'ro.product.device' : 'device3',
       },
   ]
 
@@ -291,10 +288,10 @@
 
   @staticmethod
   def _test_GetPackageMetadata_swapBuildTimestamps(target_info, source_info):
-    (target_info['build.prop'].build_props['ro.build.date.utc'],
-     source_info['build.prop'].build_props['ro.build.date.utc']) = (
-         source_info['build.prop'].build_props['ro.build.date.utc'],
-         target_info['build.prop'].build_props['ro.build.date.utc'])
+    (target_info['build.prop']['ro.build.date.utc'],
+     source_info['build.prop']['ro.build.date.utc']) = (
+         source_info['build.prop']['ro.build.date.utc'],
+         target_info['build.prop']['ro.build.date.utc'])
 
   def test_GetPackageMetadata_unintentionalDowngradeDetected(self):
     target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
@@ -531,7 +528,7 @@
   def test_WriteFingerprintAssertion_without_oem_props(self):
     target_info = common.BuildInfo(self.TEST_TARGET_INFO_DICT, None)
     source_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
-    source_info_dict['build.prop'].build_props['ro.build.fingerprint'] = (
+    source_info_dict['build.prop']['ro.build.fingerprint'] = (
         'source-build-fingerprint')
     source_info = common.BuildInfo(source_info_dict, None)
 
@@ -570,7 +567,7 @@
     target_info = common.BuildInfo(self.TEST_INFO_DICT_USES_OEM_PROPS,
                                    self.TEST_OEM_DICTS)
     source_info_dict = copy.deepcopy(self.TEST_INFO_DICT_USES_OEM_PROPS)
-    source_info_dict['build.prop'].build_props['ro.build.thumbprint'] = (
+    source_info_dict['build.prop']['ro.build.thumbprint'] = (
         'source-build-thumbprint')
     source_info = common.BuildInfo(source_info_dict, self.TEST_OEM_DICTS)