From 2ef33a4d6553f9718da17c4c02e28be5a33d2208 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 29 Mar 2022 13:42:09 +0000 Subject: mainline_modules_sdks.py: Reformat Test: atest --host mainline_modules_sdks_test pyformat -s 4 --force_quote_type double -i build/mainline_modules_sdks*.py /usr/bin/pylint --rcfile $ANDROID_BUILD_TOP/tools/repohooks/tools/pylintrc build/mainline_modules_sdks*.py Change-Id: I7f7b5f6e41c6a8cec02ec547a9b61c7922700880 --- build/mainline_modules_sdks.py | 27 +++++++++++------------- build/mainline_modules_sdks_test.py | 41 +++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 37 deletions(-) (limited to 'build') diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index b42d6556..6ebe37c8 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -893,34 +893,31 @@ class SdkDistProducer: for module in modules: for sdk_version in sdk_versions: for sdk in module.sdks: - sdk_dist_dir = os.path.join( - build_release_dist_dir, sdk_version) - self.populate_dist_snapshot( - build_release, module, sdk, sdk_dist_dir, sdk_version, - snapshots_dir) + sdk_dist_dir = os.path.join(build_release_dist_dir, + sdk_version) + self.populate_dist_snapshot(build_release, module, sdk, + sdk_dist_dir, sdk_version, + snapshots_dir) def populate_bundled_dist(self, build_release, modules, snapshots_dir): sdk_dist_dir = self.bundled_mainline_sdks_dir for module in modules: for sdk in module.sdks: - self.populate_dist_snapshot( - build_release, module, sdk, sdk_dist_dir, "current", - snapshots_dir) + self.populate_dist_snapshot(build_release, module, sdk, + sdk_dist_dir, "current", + snapshots_dir) def populate_dist_snapshot(self, build_release, module, sdk, sdk_dist_dir, sdk_version, snapshots_dir): - subdir = re.sub("^.+-(sdk|(host|test)-exports)$", r'\1', sdk) + subdir = re.sub("^.+-(sdk|(host|test)-exports)$", r"\1", sdk) if subdir not in ("sdk", "host-exports", "test-exports"): - raise Exception( - f"{sdk} is not a valid name, expected it to end" - f" with -(sdk|host-exports|test-exports)" - ) + raise Exception(f"{sdk} is not a valid name, expected it to end" + f" with -(sdk|host-exports|test-exports)") sdk_dist_subdir = os.path.join(sdk_dist_dir, module.apex, subdir) sdk_path = sdk_snapshot_zip_file(snapshots_dir, sdk, sdk_version) transformations = module.transformations(build_release) - self.dist_sdk_snapshot_zip(sdk_path, sdk_dist_subdir, - transformations) + self.dist_sdk_snapshot_zip(sdk_path, sdk_dist_subdir, transformations) def dist_sdk_snapshot_zip(self, src_sdk_zip, sdk_dist_dir, transformations): """Copy the sdk snapshot zip file to a dist directory. diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py index 084230e8..84c775d3 100644 --- a/build/mainline_modules_sdks_test.py +++ b/build/mainline_modules_sdks_test.py @@ -25,10 +25,9 @@ from unittest import mock import mainline_modules_sdks as mm -MAINLINE_MODULES_BY_APEX = dict((m.apex, m) for m in ( - mm.MAINLINE_MODULES + - mm.BUNDLED_MAINLINE_MODULES + - mm.PLATFORM_SDKS_FOR_MAINLINE)) +MAINLINE_MODULES_BY_APEX = dict( + (m.apex, m) for m in (mm.MAINLINE_MODULES + mm.BUNDLED_MAINLINE_MODULES + + mm.PLATFORM_SDKS_FOR_MAINLINE)) class FakeSnapshotBuilder(mm.SnapshotBuilder): @@ -159,8 +158,8 @@ class TestProduceDist(unittest.TestCase): ], sorted(self.list_files_in_dir(self.tmp_dist_dir))) - r_snaphot_dir = os.path.join( - self.tmp_out_dir, "soong/mainline-sdks/test/for-R-build") + r_snaphot_dir = os.path.join(self.tmp_out_dir, + "soong/mainline-sdks/test/for-R-build") aosp_ipsec_r_bp_file = "com.android.ipsec/Android.bp" google_wifi_android_bp = "com.google.android.wifi/Android.bp" self.assertEqual([ @@ -195,27 +194,25 @@ class TestProduceDist(unittest.TestCase): def test_old_release(self): modules = [ - MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module - MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module - MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK + MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module + MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module + MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK ] build_releases = [mm.S] self.produce_dist(modules, build_releases) # pylint: disable=line-too-long - self.assertEqual( - [ - "mainline-sdks/for-S-build/current/com.android.art/host-exports/art-module-host-exports-current.zip", - "mainline-sdks/for-S-build/current/com.android.art/sdk/art-module-sdk-current.zip", - "mainline-sdks/for-S-build/current/com.android.art/test-exports/art-module-test-exports-current.zip", - ], - sorted(self.list_files_in_dir(self.tmp_dist_dir))) + self.assertEqual([ + "mainline-sdks/for-S-build/current/com.android.art/host-exports/art-module-host-exports-current.zip", + "mainline-sdks/for-S-build/current/com.android.art/sdk/art-module-sdk-current.zip", + "mainline-sdks/for-S-build/current/com.android.art/test-exports/art-module-test-exports-current.zip", + ], sorted(self.list_files_in_dir(self.tmp_dist_dir))) def test_latest_release(self): modules = [ - MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module - MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module - MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK + MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module + MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module + MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK ] build_releases = [mm.LATEST] self.produce_dist(modules, build_releases) @@ -237,9 +234,9 @@ class TestProduceDist(unittest.TestCase): def test_legacy_release(self): modules = [ - MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module - MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module - MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK + MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module + MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module + MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK ] build_releases = [mm.LEGACY_BUILD_RELEASE] self.produce_dist(modules, build_releases) -- cgit v1.2.3