commit adad39744571d94805dbf35e5310398a984325ed
author David Pursehouse <dpursehouse@digital.ai> Thu Jun 25 12:10:35 2020 +0900
committer David Pursehouse <dpursehouse@digital.ai> Thu Jun 25 12:10:35 2020 +0900
tree 73e8be50a2e932265963fa7249f1e50c81111fea
parent dc6762f60e561868cabe4824c4c13291eeaa068d
parent 291560e57712fc8ea61db80ae05f0453eae0c4df

Merge branch 'stable-3.2'

* stable-3.2:
  ReplicationIT: Enable task deletion when testing delete branch
  ReplicationIT: Test that branch deletion is replicated
  Make SecureCredentialsFactory public

Change-Id: Ic5c6cb20ed06010068cc93be564cb05af41d360d

src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
index 6ad5558..653e5a1 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
@@ -331,6 +331,53 @@
   }
 
   @Test
+  public void shouldReplicateBranchDeletionWhenMirror() throws Exception {
+    replicateBranchDeletion(true);
+  }
+
+  @Test
+  public void shouldNotReplicateBranchDeletionWhenNotMirror() throws Exception {
+    replicateBranchDeletion(false);
+  }
+
+  private void replicateBranchDeletion(boolean mirror) throws Exception {
+    tasksStorage.disableDeleteForTesting(false);
+
+    setReplicationDestination("foo", "replica", ALL_PROJECTS, mirror);
+    reloadConfig();
+
+    Project.NameKey targetProject = createTestProject(project + "replica");
+    String branchToDelete = "refs/heads/todelete";
+    String master = "refs/heads/master";
+    BranchInput input = new BranchInput();
+    input.revision = master;
+    gApi.projects().name(project.get()).branch(branchToDelete).create(input);
+
+    assertThat(listReplicationTasks("refs/heads/(todelete|master)")).hasSize(2);
+
+    try (Repository repo = repoManager.openRepository(targetProject)) {
+      waitUntil(() -> checkedGetRef(repo, branchToDelete) != null);
+    }
+
+    gApi.projects().name(project.get()).branch(branchToDelete).delete();
+
+    assertThat(listReplicationTasks(branchToDelete)).hasSize(1);
+
+    try (Repository repo = repoManager.openRepository(targetProject)) {
+      if (mirror) {
+        waitUntil(() -> checkedGetRef(repo, branchToDelete) == null);
+      }
+
+      Ref targetBranchRef = getRef(repo, branchToDelete);
+      if (mirror) {
+        assertThat(targetBranchRef).isNull();
+      } else {
+        assertThat(targetBranchRef).isNotNull();
+      }
+    }
+  }
+
+  @Test
   public void shouldNotDrainTheQueueWhenReloading() throws Exception {
     // Setup repo to replicate
     Project.NameKey targetProject = createTestProject(project + "replica");
@@ -481,13 +528,24 @@
 
   private void setReplicationDestination(
       String remoteName, String replicaSuffix, Optional<String> project) throws IOException {
-    setReplicationDestination(remoteName, Arrays.asList(replicaSuffix), project);
+    setReplicationDestination(remoteName, Arrays.asList(replicaSuffix), project, false);
+  }
+
+  private void setReplicationDestination(
+      String remoteName, String replicaSuffix, Optional<String> project, boolean mirror)
+      throws IOException {
+    setReplicationDestination(remoteName, Arrays.asList(replicaSuffix), project, mirror);
   }
 
   private void setReplicationDestination(
       String remoteName, List<String> replicaSuffixes, Optional<String> project)
       throws IOException {
+    setReplicationDestination(remoteName, replicaSuffixes, project, false);
+  }
 
+  private void setReplicationDestination(
+      String remoteName, List<String> replicaSuffixes, Optional<String> project, boolean mirror)
+      throws IOException {
     List<String> replicaUrls =
         replicaSuffixes.stream()
             .map(suffix -> gitPath.resolve("${name}" + suffix + ".git").toString())
@@ -495,6 +553,7 @@
     config.setStringList("remote", remoteName, "url", replicaUrls);
     config.setInt("remote", remoteName, "replicationDelay", TEST_REPLICATION_DELAY);
     config.setInt("remote", remoteName, "replicationRetry", TEST_REPLICATION_RETRY);
+    config.setBoolean("remote", remoteName, "mirror", mirror);
     project.ifPresent(prj -> config.setString("remote", remoteName, "projects", prj));
     config.setBoolean("gerrit", null, "autoReload", true);
     config.save();