From 5efd759085839180c3d623ff3020b4d85c5449ec Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 22 Nov 2024 16:25:46 -0800 Subject: [PATCH] Remove now unused `apk-health-tests`. Can always re-add in the future. (#159349) https://github.com/flutter/flutter/issues/159000 resolved (for now). --- .ci.yaml | 23 ------------------- TESTOWNERS | 1 - dev/bots/test.dart | 14 ----------- .../android_e2e_api_test.dart | 4 ---- ...d_gradle_deprecated_plugin_apply_test.dart | 4 ---- ...tter_plugins_strings_in_comments_test.dart | 4 ---- ...roid_gradle_print_build_variants_test.dart | 4 ---- ...android_plugin_example_app_build_test.dart | 4 ---- ...ter_build_with_compilation_error_test.dart | 4 ---- .../native_assets_agp_version_test.dart | 5 ---- .../isolated/native_assets_test.dart | 2 -- ...e_assets_without_cbuild_assemble_test.dart | 4 ---- 12 files changed, 73 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 1aa37d8e71..0a61bd3ed8 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -1297,29 +1297,6 @@ targets: - bin/** - .ci.yaml - - name: Linux flutter_build_apk_health_tests - recipe: flutter/flutter_drone - # WARNING: Do *NOT* enable. This intended for testing on CI only. - # Ask matanlurey@ or @gmackall if you have any questions. - bringup: true - timeout: 60 - properties: - add_recipes_cq: "true" - dependencies: >- - [ - {"dependency": "android_sdk", "version": "version:35v1"}, - {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"}, - {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, - {"dependency": "cmake", "version": "build_id:8787856497187628321"}, - {"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"}, - {"dependency": "ninja", "version": "version:1.9.0"}, - {"dependency": "open_jdk", "version": "version:17"} - ] - shard: flutter_build_apk_health_tests - tags: > - ["framework", "hostonly", "shard", "linux"] - test_timeout_secs: "2700" - - name: Linux android_preview_tool_integration_tests recipe: flutter/flutter_drone timeout: 60 diff --git a/TESTOWNERS b/TESTOWNERS index 5715846e80..76c8b2bef2 100644 --- a/TESTOWNERS +++ b/TESTOWNERS @@ -327,7 +327,6 @@ # coverage @goderbauer @flutter/infra # customer_testing @Piinks @flutter/framework # docs @Piinks @flutter/framework -# flutter_build_apk_health_tests @matanlurey @gmackall # flutter_driver_android_test @matanlurey @johnmccutchan # flutter_packaging @christopherfujino @flutter/infra # flutter_plugins @stuartmorgan @flutter/plugin diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 4077a937e1..f88ce8ca89 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -136,7 +136,6 @@ Future main(List args) async { 'tool_tests': _runToolTests, 'web_tool_tests': _runWebToolTests, 'tool_integration_tests': _runIntegrationToolTests, - 'flutter_build_apk_health_tests': _runFlutterBuildApkHealthTests, 'android_preview_tool_integration_tests': androidPreviewIntegrationToolTestsRunner, 'android_java11_tool_integration_tests': androidJava11IntegrationToolTestsRunner, 'tool_host_cross_arch_tests': _runToolHostCrossArchTests, @@ -239,19 +238,6 @@ Future _runIntegrationToolTests() async { ); } -Future _runFlutterBuildApkHealthTests() async { - await runDartTest( - _toolsPath, - forceSingleCore: true, - testPaths: [ - path.join(_toolsPath, 'test', 'integration.shard'), - ], - collectMetrics: true, - runSkipped: true, - tags: ['flutter-build-apk'], - ); -} - Future _runToolTests() async { await selectSubshard({ 'general': _runGeneralToolTests, diff --git a/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart b/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart index 599f66a606..277be58754 100644 --- a/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_e2e_api_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'package:file/file.dart'; import 'package:flutter_tools/src/base/io.dart'; diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart index 20221f174b..7679c46ea6 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'dart:convert'; import 'package:file/file.dart'; diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart index 4daf82441a..b95b226c25 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_legacy_flutter_plugins_strings_in_comments_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - // This test can be removed once https://github.com/flutter/flutter/issues/155484 is resolved. import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart index e8f60aff81..5997054132 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_print_build_variants_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'dart:convert'; import 'package:collection/collection.dart'; diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart index 67a70cf04e..57d84ddcf4 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'package:file_testing/file_testing.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart index 7c5d2aefa6..77ff8df921 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart +++ b/packages/flutter_tools/test/integration.shard/flutter_build_with_compilation_error_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'package:file/file.dart'; import 'package:flutter_tools/src/base/io.dart'; diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart index 6973af8c64..4272a7552f 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_agp_version_test.dart @@ -2,11 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -@Timeout(Duration(minutes: 10)) -library; - import 'dart:io'; import 'package:file/file.dart'; diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart index e86fea21ce..09edb56372 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_test.dart @@ -10,8 +10,6 @@ // contain the native assets mapping. // When doing a hot reload, this mapping must stay in place. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) @Timeout(Duration(minutes: 10)) library; diff --git a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart index 81b1c050ba..6f4eb12700 100644 --- a/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart +++ b/packages/flutter_tools/test/integration.shard/isolated/native_assets_without_cbuild_assemble_test.dart @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(matanlurey): Remove after debugging https://github.com/flutter/flutter/issues/159000. -@Tags(['flutter-build-apk']) -library; - import 'dart:io' as io; import 'package:file/file.dart';