From a85bdf0bf068c43c89f98b3343ef48823d786fdd Mon Sep 17 00:00:00 2001 From: Tianjie Date: Wed, 29 Jul 2020 11:56:19 -0700 Subject: [PATCH] Update language to comply with Android's inclusive language guidance More details in: https://source.android.com/setup/contribute/respectful-code Bug: 161896447 Test: build, run unittests Change-Id: I35732333da0dd0c871f3e37c4af1b2211647d1e3 --- tools/releasetools/common.py | 2 +- tools/releasetools/sign_target_files_apks.py | 2 +- tools/releasetools/test_check_target_files_vintf.py | 4 ++-- tools/releasetools/test_verity_utils.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 32864ab2c..9ac2cc66a 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -601,7 +601,7 @@ def ReadFromInputFile(input_file, fn): def LoadInfoDict(input_file, repacking=False): """Loads the key/value pairs from the given input target_files. - It reads `META/misc_info.txt` file in the target_files input, does sanity + It reads `META/misc_info.txt` file in the target_files input, does validation checks and returns the parsed key/value pairs for to the given build. It's usually called early when working on input target_files files, e.g. when generating OTAs, or signing builds. Note that the function may be called diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 1cb9a4f47..b4646b7c7 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -1149,7 +1149,7 @@ def main(argv): apex_name, key = a.split("=") OPTIONS.extra_apex_payload_keys[apex_name] = key elif o == "--skip_apks_with_path_prefix": - # Sanity check the prefix, which must be in all upper case. + # Check the prefix, which must be in all upper case. prefix = a.split('/')[0] if not prefix or prefix != prefix.upper(): raise ValueError("Invalid path prefix '%s'" % (a,)) diff --git a/tools/releasetools/test_check_target_files_vintf.py b/tools/releasetools/test_check_target_files_vintf.py index d32622932..8725dd692 100644 --- a/tools/releasetools/test_check_target_files_vintf.py +++ b/tools/releasetools/test_check_target_files_vintf.py @@ -87,8 +87,8 @@ class CheckTargetFilesVintfTest(test_utils.ReleaseToolsTestCase): return test_dir @test_utils.SkipIfExternalToolsUnavailable() - def test_CheckVintf_sanity(self): - msg = 'Sanity check with skeleton target files failed.' + def test_CheckVintf_skeleton(self): + msg = 'vintf check with skeleton target files failed.' test_dir = self.prepare_test_dir('does-not-exist') self.assertTrue(CheckVintf(test_dir), msg=msg) diff --git a/tools/releasetools/test_verity_utils.py b/tools/releasetools/test_verity_utils.py index cfc494249..a850390b8 100644 --- a/tools/releasetools/test_verity_utils.py +++ b/tools/releasetools/test_verity_utils.py @@ -233,7 +233,7 @@ class VerifiedBootVersion1VerityImageBuilderTest(ReleaseToolsTestCase): os.path.join(get_testdata_dir(), 'testkey_mincrypt')) @SkipIfExternalToolsUnavailable() - def test_Build_SanityCheck(self): + def test_Build_ValidationCheck(self): # A validity check for the test itself: the image shouldn't be verifiable # with wrong key. self.assertRaises(