Merge branch 'main' into avm99963-monorail

Merged commit 4137ed7879acadbf891e8c471108acb874dae886.

GitOrigin-RevId: b6100ffc5b1da355a35f37b13fcaaf746ee8b307
diff --git a/businesslogic/test/work_env_test.py b/businesslogic/test/work_env_test.py
index 63ac60f..dd93bf7 100644
--- a/businesslogic/test/work_env_test.py
+++ b/businesslogic/test/work_env_test.py
@@ -1454,14 +1454,18 @@
         summary='sum',
         status='New',
         field_values=[input_fv])
+    attachments = [
+      ('README.md', 'readme content', 'text/plain'),
+      ('hello.txt', 'hello content', 'text/plain')]
     with self.work_env as we:
-      actual_issue = we.MakeIssue(input_issue, 'description', False)
+      actual_issue = we.MakeIssue(
+        input_issue, 'description', False, attachments)
     self.assertEqual(actual_issue.project_id, 789)
     self.assertEqual(actual_issue.summary, 'sum')
     self.assertEqual(actual_issue.status, 'New')
     self.assertEqual(actual_issue.reporter_id, 111)
     self.assertEqual(actual_issue.field_values, [input_fv])
-
+    self.assertEqual(2, actual_issue.attachment_count)
   @mock.patch(
       'features.send_notifications.PrepareAndSendIssueBlockingNotification')
   @mock.patch(