diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2020-01-22 23:08:43 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2020-02-04 22:36:10 +0100 |
| commit | b88351bc938cad7e4b9548e7141bbc4e3be09603 (patch) | |
| tree | b89c5bd5acf1532e942f544f1bf31b4a3e494aa6 | |
| parent | 47d74d21738ccf45b2071b1fd1c7862386b47a4e (diff) | |
Don't send mails on publish change edits for WIP changes
Bug: Issue 10397
Change-Id: I6b6710d17138f277ac118924355311d192710f5c
| -rw-r--r-- | java/com/google/gerrit/server/edit/ChangeEditUtil.java | 3 | ||||
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index d5add76be1..39cf44f255 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -182,7 +182,8 @@ public class ChangeEditUtil { patchSetInserterFactory .create(notes, psId, squashed) .setNotify(notify) - .setAccountsToNotify(accountsToNotify); + .setAccountsToNotify(accountsToNotify) + .setSendEmail(!change.isWorkInProgress()); StringBuilder message = new StringBuilder("Patch Set ").append(inserter.getPatchSetId().get()).append(": "); diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java index 7573a09944..47f4a8f01b 100644 --- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java +++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java @@ -156,8 +156,11 @@ public class ChangeEditIT extends AbstractDaemonTest { public void publishEdit() throws Exception { createArbitraryEditFor(changeId); + AddReviewerInput in = new AddReviewerInput(); + in.reviewer = user.email; + gApi.changes().id(changeId).addReviewer(in); + PublishChangeEditInput publishInput = new PublishChangeEditInput(); - publishInput.notify = NotifyHandling.NONE; gApi.changes().id(changeId).edit().publish(publishInput); assertThat(getEdit(changeId)).isAbsent(); @@ -174,8 +177,10 @@ public class ChangeEditIT extends AbstractDaemonTest { assertThat(info.messages).isNotEmpty(); assertThat(Iterables.getLast(info.messages).tag) .isEqualTo(ChangeMessagesUtil.TAG_UPLOADED_PATCH_SET); + assertThat(sender.getMessages()).isNotEmpty(); // Move the change to WIP, repeat, and verify. + sender.clear(); gApi.changes().id(changeId).setWorkInProgress(); createEmptyEditFor(changeId); gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW2)); @@ -184,6 +189,7 @@ public class ChangeEditIT extends AbstractDaemonTest { assertThat(info.messages).isNotEmpty(); assertThat(Iterables.getLast(info.messages).tag) .isEqualTo(ChangeMessagesUtil.TAG_UPLOADED_WIP_PATCH_SET); + assertThat(sender.getMessages()).isEmpty(); } @Test |