StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "releasetools: Enable a few tests in OtaFromTargetFilesTest."

Browse Source 
am: 56215ba930

Change-Id: Iccce31970307dff8bf61d6495ff3a65bff3429ed
This commit is contained in:
Tao Bao
2019-04-16 07:22:17 -07:00
committed by android-build-merger
parent 43a2566277 56215ba930
commit dc0ad08e49
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/test_ota_from_target_files.py
View File

@@ -425,9 +425,7 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
} }
common.OPTIONS.search_path = test_utils.get_search_path() common.OPTIONS.search_path = test_utils.get_search_path()
self.assertIsNotNone(common.OPTIONS.search_path)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_abOta_full(self): def test_GetPackageMetadata_abOta_full(self):
target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT) target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
target_info_dict['ab_update'] = 'true' target_info_dict['ab_update'] = 'true'
@@ -446,7 +444,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
}, },
metadata) metadata)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_abOta_incremental(self): def test_GetPackageMetadata_abOta_incremental(self):
target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT) target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
target_info_dict['ab_update'] = 'true' target_info_dict['ab_update'] = 'true'
@@ -469,7 +466,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
}, },
metadata) metadata)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_nonAbOta_full(self): def test_GetPackageMetadata_nonAbOta_full(self):
target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None) target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None)
metadata = GetPackageMetadata(target_info) metadata = GetPackageMetadata(target_info)
@@ -485,7 +481,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
}, },
metadata) metadata)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_nonAbOta_incremental(self): def test_GetPackageMetadata_nonAbOta_incremental(self):
target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None) target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None)
source_info = BuildInfo(self.TEST_SOURCE_INFO_DICT, None) source_info = BuildInfo(self.TEST_SOURCE_INFO_DICT, None)
@@ -505,7 +500,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
}, },
metadata) metadata)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_wipe(self): def test_GetPackageMetadata_wipe(self):
target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None) target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None)
common.OPTIONS.wipe_user_data = True common.OPTIONS.wipe_user_data = True
@@ -523,7 +517,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
}, },
metadata) metadata)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_retrofitDynamicPartitions(self): def test_GetPackageMetadata_retrofitDynamicPartitions(self):
target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None) target_info = BuildInfo(self.TEST_TARGET_INFO_DICT, None)
common.OPTIONS.retrofit_dynamic_partitions = True common.OPTIONS.retrofit_dynamic_partitions = True
@@ -548,7 +541,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
source_info['build.prop']['ro.build.date.utc'], source_info['build.prop']['ro.build.date.utc'],
target_info['build.prop']['ro.build.date.utc']) target_info['build.prop']['ro.build.date.utc'])
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_unintentionalDowngradeDetected(self): def test_GetPackageMetadata_unintentionalDowngradeDetected(self):
target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT) target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
source_info_dict = copy.deepcopy(self.TEST_SOURCE_INFO_DICT) source_info_dict = copy.deepcopy(self.TEST_SOURCE_INFO_DICT)
@@ -561,7 +553,6 @@ class OtaFromTargetFilesTest(test_utils.ReleaseToolsTestCase):
self.assertRaises(RuntimeError, GetPackageMetadata, target_info, self.assertRaises(RuntimeError, GetPackageMetadata, target_info,
source_info) source_info)
@test_utils.SkipIfExternalToolsUnavailable()
def test_GetPackageMetadata_downgrade(self): def test_GetPackageMetadata_downgrade(self):
target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT) target_info_dict = copy.deepcopy(self.TEST_TARGET_INFO_DICT)
source_info_dict = copy.deepcopy(self.TEST_SOURCE_INFO_DICT) source_info_dict = copy.deepcopy(self.TEST_SOURCE_INFO_DICT)