diff --git a/app_dart/lib/src/request_handlers/flaky_handler_utils.dart b/app_dart/lib/src/request_handlers/flaky_handler_utils.dart index ed7d0a80e..cb42ee202 100644 --- a/app_dart/lib/src/request_handlers/flaky_handler_utils.dart +++ b/app_dart/lib/src/request_handlers/flaky_handler_utils.dart @@ -23,7 +23,9 @@ const String kWebLabel = 'team-web'; const String kInfraLabel = 'team-infra'; const String kAndroidLabel = 'team-android'; const String kIosLabel = 'team-ios'; -const String kReleaseLabel = 'team-release'; +const String kLinuxLabel = 'team-linux'; +const String kMacosLabel = 'team-macos'; +const String kWindowsLabel = 'team-windows'; const String kEcosystemLabel = 'team-ecosystem'; const String kP0Label = 'P0'; const String kP1Label = 'P1'; @@ -443,7 +445,9 @@ String? getTeamLabelFromTeam(Team? team) { Team.infra => kInfraLabel, Team.android => kAndroidLabel, Team.ios => kIosLabel, - Team.release => kReleaseLabel, + Team.linux => kLinuxLabel, + Team.macos => kMacosLabel, + Team.windows => kWindowsLabel, Team.plugins => kEcosystemLabel, Team.unknown || null => null, }; @@ -461,7 +465,9 @@ enum Team { infra, android, ios, - release, + linux, + macos, + windows, plugins, unknown, } diff --git a/app_dart/lib/src/request_handlers/test_ownership.dart b/app_dart/lib/src/request_handlers/test_ownership.dart index 848d6a335..77f9975bd 100644 --- a/app_dart/lib/src/request_handlers/test_ownership.dart +++ b/app_dart/lib/src/request_handlers/test_ownership.dart @@ -25,7 +25,7 @@ abstract class TestOwner { } Team teamFromString(String teamString) { - switch (teamString) { + switch (teamString.trim().toLowerCase()) { case 'flutter/framework': return Team.framework; case 'flutter/engine': @@ -34,6 +34,24 @@ Team teamFromString(String teamString) { return Team.tool; case 'flutter/web': return Team.web; + case 'flutter/infra': + case 'flutter/releases': + return Team.infra; + case 'flutter/android': + return Team.android; + case 'flutter/ios': + return Team.ios; + case 'flutter/linux': + return Team.linux; + case 'flutter/macos': + return Team.macos; + case 'flutter/windows': + return Team.windows; + case 'flutter/plugin': + case 'flutter/plugins': + case 'flutter/ecosystem': + case 'flutter/packages': + return Team.plugins; } return Team.unknown; } diff --git a/app_dart/lib/src/request_handlers/update_suppressed_test.dart b/app_dart/lib/src/request_handlers/update_suppressed_test.dart index eb3be49d8..0b32070fb 100644 --- a/app_dart/lib/src/request_handlers/update_suppressed_test.dart +++ b/app_dart/lib/src/request_handlers/update_suppressed_test.dart @@ -104,13 +104,24 @@ final class UpdateSuppressedTest extends ApiRequestHandler { } issueLink = canonicalUrl; - final issueNumber = int.parse(Uri.parse(canonicalUrl).pathSegments.last); + final canonicalUri = Uri.parse(canonicalUrl); + if (canonicalUri.pathSegments.length < 4) { + throw const BadRequestException('Invalid issue link format.'); + } + final issueSlug = RepositorySlug( + canonicalUri.pathSegments[0], + canonicalUri.pathSegments[1], + ); + final issueNumber = int.tryParse(canonicalUri.pathSegments.last); + if (issueNumber == null) { + throw const BadRequestException('Invalid issue number in issue link.'); + } - final githubService = await config.createGithubService(repository); + final githubService = await config.createGithubService(issueSlug); final Issue? issue; try { issue = await githubService.getIssue( - repository, + issueSlug, issueNumber: issueNumber, ); } catch (e) { diff --git a/app_dart/test/request_handlers/flaky_handler_utiles_test.dart b/app_dart/test/request_handlers/flaky_handler_utiles_test.dart index af7384b37..56a30c141 100644 --- a/app_dart/test/request_handlers/flaky_handler_utiles_test.dart +++ b/app_dart/test/request_handlers/flaky_handler_utiles_test.dart @@ -7,6 +7,7 @@ import 'package:cocoon_server_test/mocks.dart'; import 'package:cocoon_server_test/test_logging.dart'; import 'package:cocoon_service/protos.dart' as pb; import 'package:cocoon_service/src/request_handlers/flaky_handler_utils.dart'; +import 'package:cocoon_service/src/request_handlers/test_ownership.dart'; import 'package:cocoon_service/src/service/big_query.dart'; import 'package:cocoon_service/src/service/config.dart'; import 'package:cocoon_service/src/service/github_service.dart'; @@ -189,12 +190,43 @@ abc_test.sh @ghi @flutter/framework }); group('Gets team label', () { test('returns correct label when matched', () async { + expect(getTeamLabelFromTeam(Team.framework), kFrameworkLabel); + expect(getTeamLabelFromTeam(Team.engine), kEngineLabel); + expect(getTeamLabelFromTeam(Team.tool), kToolLabel); + expect(getTeamLabelFromTeam(Team.web), kWebLabel); expect(getTeamLabelFromTeam(Team.infra), kInfraLabel); + expect(getTeamLabelFromTeam(Team.android), kAndroidLabel); + expect(getTeamLabelFromTeam(Team.ios), kIosLabel); + expect(getTeamLabelFromTeam(Team.linux), kLinuxLabel); + expect(getTeamLabelFromTeam(Team.macos), kMacosLabel); + expect(getTeamLabelFromTeam(Team.windows), kWindowsLabel); + expect(getTeamLabelFromTeam(Team.plugins), kEcosystemLabel); }); test('returns null when not matched', () async { expect(getTeamLabelFromTeam(Team.unknown), null); }); + + test('teamFromString maps all supported teams', () { + expect(teamFromString('flutter/framework'), Team.framework); + expect(teamFromString('flutter/engine'), Team.engine); + expect(teamFromString('flutter/tool'), Team.tool); + expect(teamFromString('flutter/web'), Team.web); + expect(teamFromString('flutter/infra'), Team.infra); + expect(teamFromString('flutter/releases'), Team.infra); + expect(teamFromString('flutter/android'), Team.android); + expect(teamFromString('flutter/ios'), Team.ios); + expect(teamFromString('flutter/linux'), Team.linux); + expect(teamFromString('flutter/macos'), Team.macos); + expect(teamFromString('flutter/windows'), Team.windows); + expect(teamFromString('flutter/plugin'), Team.plugins); + expect(teamFromString('flutter/plugins'), Team.plugins); + expect(teamFromString('flutter/ecosystem'), Team.plugins); + expect(teamFromString('flutter/packages'), Team.plugins); + expect(teamFromString('flutter/nonexistent'), Team.unknown); + expect(teamFromString(' flutter/framework '), Team.framework); + expect(teamFromString('Flutter/Engine'), Team.engine); + }); }); group('IssueBuilder', () { diff --git a/app_dart/test/request_handlers/update_suppressed_test_test.dart b/app_dart/test/request_handlers/update_suppressed_test_test.dart index 496300ab1..c1ca75a10 100644 --- a/app_dart/test/request_handlers/update_suppressed_test_test.dart +++ b/app_dart/test/request_handlers/update_suppressed_test_test.dart @@ -210,6 +210,11 @@ void main() { await tester.post(handler); // Verify document created + expect( + githubService.requestedIssueSlug, + RepositorySlug('flutter', 'flutter'), + ); + expect(githubService.requestedIssueNumber, 123); expect( firestore, existsInStorage(SuppressedTest.metadata, [ @@ -231,6 +236,39 @@ void main() { ); }); + test( + 'queries issue from issueLink repository when suppressing flutter/packages test', + () async { + githubService.issueResponse = Issue(state: 'open'); + + tester.request.body = jsonEncode({ + 'testName': 'Linux repo_checks', + 'repository': 'flutter/packages', + 'action': 'SUPPRESS', + 'issueLink': 'https://github.com/flutter/flutter/issues/456', + 'note': 'Flaky in packages', + }); + + await tester.post(handler); + + expect( + githubService.requestedIssueSlug, + RepositorySlug('flutter', 'flutter'), + ); + expect(githubService.requestedIssueNumber, 456); + expect( + firestore, + existsInStorage(SuppressedTest.metadata, [ + isSuppressedTest + .hasIssueLink('https://github.com/flutter/flutter/issues/456') + .hasTestName('Linux repo_checks') + .hasRepository('flutter/packages') + .hasIsSuppressed(isTrue), + ]), + ); + }, + ); + test('creates new suppression when issueLink has trailing slash', () async { githubService.issueResponse = Issue(state: 'open'); @@ -507,9 +545,13 @@ void main() { class FakeGithubServiceWithIssue extends FakeGithubService { Issue? issueResponse; Object? error; + RepositorySlug? requestedIssueSlug; + int? requestedIssueNumber; @override Future? getIssue(RepositorySlug slug, {int? issueNumber}) { + requestedIssueSlug = slug; + requestedIssueNumber = issueNumber; if (error != null) { throw error!; }