commit 544a6f364cadf362ba24f5634e36d9ccb435b4bd
author David Pursehouse <dpursehouse@collab.net> Fri Sep 13 10:32:19 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Sep 13 10:57:31 2019 +0900
tree ba680d5a5c34fd10f188c76b9b5845b7774a3da1
parent 17aed3abb43bd90383ba6044b3bbed24dbcb0049
parent 51028b5ae229b1ab8c7c9d7c55dc0297430c8042

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Turn off autoReindexIfStale by default
  ReviewDbBatchUpdate: Avoid NPE when updating All-Users

Change-Id: Ia50eaa043b1f1ee3bfb97b6ee7bde2c04aaad6bb

javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java

diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index e2d2cf4..216677d 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -2228,6 +2228,17 @@
   }
 
   @Test
+  public void noEditAndUpdateAllUsersInSameChangeStack() throws Exception {
+    List<RevCommit> commits = createChanges(2, "refs/for/master");
+    String id2 = byCommit(commits.get(1)).change().getKey().get();
+    addDraft(id2, commits.get(1).name(), newDraft(FILE_NAME, 1, "comment2"));
+    // First change in stack unchanged.
+    RevCommit unChanged = commits.remove(0);
+    // Publishing draft comments on change 2 updates All-Users.
+    amendChanges(unChanged.toObjectId(), commits, "refs/for/master%publish-comments");
+  }
+
+  @Test
   public void pushWithDraftOptionIsDisabledPerDefault() throws Exception {
     for (String ref : ImmutableSet.of("refs/drafts/master", "refs/for/master%draft")) {
       PushOneCommit.Result r = pushTo(ref);