Merge branch 'flutter:main' into main

ricardoamador · Feb 27, 2024 · 34aec8a · 34aec8a
2 parents b061e98 + a72a221
commit 34aec8a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/app_dart/lib/src/request_handlers/reset_prod_task.dart b/app_dart/lib/src/request_handlers/reset_prod_task.dart
@@ -138,6 +138,8 @@ class ResetProdTask extends ApiRequestHandler<Body> {
       slug: slug,
     );
     final Commit commit = await _getCommitFromTask(datastore, task);
+    sha ??= commit.id!.split('/').last;
+    taskName ??= task.name;
 
     final CiYaml ciYaml = await scheduler.getCiYaml(commit);
     final Target target = ciYaml.postsubmitTargets.singleWhere((Target target) => target.value.name == task.name);

diff --git a/app_dart/test/request_handlers/reset_prod_task_test.dart b/app_dart/test/request_handlers/reset_prod_task_test.dart
@@ -96,6 +96,11 @@ void main() {
       config.db.values[task.key] = task;
       config.db.values[commit.key] = commit;
       expect(await tester.post(handler), Body.empty);
+
+      final List<dynamic> captured = verify(mockFirestoreService.getDocument(captureAny)).captured;
+      expect(captured.length, 1);
+      final String documentName = captured[0] as String;
+      expect(documentName, '$kDatabase/documents/$kTaskCollectionId/${commit.sha}_${task.name}_${task.attempts}');
     });
 
     test('Re-schedule existing task', () async {

diff --git a/auto_submit/lib/service/revert_issue_body_formatter.dart b/auto_submit/lib/service/revert_issue_body_formatter.dart
@@ -44,19 +44,28 @@ class RevertIssueBodyFormatter {
 
     // Create the body for the revert issue.
     revertPrBody = '''
+<!-- start_original_pr_link -->
 $revertPrLink
-
+<!-- end_original_pr_link -->
+<!-- start_initiating_author -->
 Initiated by: $initiatingAuthor
-
+<!-- end_initiating_author -->
+<!-- start_revert_reason -->
 Reason for reverting: $revertReason
-
+<!-- end_revert_reason -->
+<!-- start_original_pr_author -->
 Original PR Author: $prToRevertAuthor
+<!-- end_original_pr_author -->
 
+<!-- start_reviewers -->
 Reviewed By: ${SetBase.setToString(prToRevertReviewers)}
+<!-- end_reviewers -->
 
+<!-- start_revert_body -->
 This change reverts the following previous change:
 Original Description:
 $prToRevertBody
+<!-- end_revert_body -->
 ''';
 
     return this;