commit d7aa9dae0869d956238e43b0a7fc2d2fff02e430
author Youssef Elghareeb <ghareeb@google.com> Thu Dec 01 14:25:58 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 01 14:25:58 2022 +0000
tree 6531c7dee0ce9679d920f9203ecd97e1bc3b5d2a
parent 860332de738659da592b27b1348832a52ae479ea
parent 3886777c100e506901c239ef867765a214548d5d

Merge "Ignore duplicate entries on project config updates via the Set Access EP"

javatests/com/google/gerrit/acceptance/api/project/AccessIT.java

diff --git a/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
index a2c96b6..6bd2b68 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
@@ -75,6 +75,7 @@
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.RefUpdate;
 import org.eclipse.jgit.lib.RefUpdate.Result;
 import org.eclipse.jgit.lib.Repository;
@@ -268,8 +269,11 @@
     ProjectAccessInput accessInput = newProjectAccessInput();
     AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
 
+    // Update project config. Record the file content and the refs_config object ID
     accessInput.add.put(REFS_HEADS, accessSectionInfo);
     pApi().access(accessInput);
+    ObjectId refsConfigId =
+        projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG).getId();
     List<String> projectConfigLines =
         Arrays.asList(projectOperations.project(newProjectName).getConfig().toText().split("\n"));
     assertThat(projectConfigLines)
@@ -281,12 +285,15 @@
             "\tlabel-Code-Review = -1..+1 group Project Owners",
             "\tpush = group Registered Users");
 
-    // Apply the same permission once more
+    // Apply the same update once more. Make sure that the file content and the ref did not change
     pApi().access(accessInput);
 
     List<String> newProjectConfigLines =
         Arrays.asList(projectOperations.project(newProjectName).getConfig().toText().split("\n"));
+    ObjectId newRefsConfigId =
+        projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG).getId();
     assertThat(projectConfigLines).isEqualTo(newProjectConfigLines);
+    assertThat(refsConfigId).isEqualTo(newRefsConfigId);
   }
 
   @Test