commit dffa3935bd481e6ee9fcee18ace013d44d51a547
author Nasser Grainawi <nasser@codeaurora.org> Wed Oct 28 15:03:46 2020 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Wed Oct 28 16:49:40 2020 -0600
tree 179b43fe0e3c2575b3e6856e23748f6ae1daf40a
parent 245e624a73b57c14f370bcf238ad8813963d64bd

ReplicationFanoutIT: Remove generic waitUntil helper

Using a non-specific timeout is a bad pattern. Tests should pick a
timeout appropriate to the action being tested.

Change-Id: I69a7e469df1dc532af6a777ac47d89852091797e

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

diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
index 6121f0f..8947bc4 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationFanoutIT.java
@@ -31,11 +31,9 @@
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import org.eclipse.jgit.lib.Ref;
@@ -51,9 +49,6 @@
     name = "replication",
     sysModule = "com.googlesource.gerrit.plugins.replication.ReplicationModule")
 public class ReplicationFanoutIT extends ReplicationDaemon {
-  private static final Duration TEST_TIMEOUT =
-      Duration.ofSeconds(TEST_REPLICATION_DELAY_SECONDS * 2);
-
   private Path pluginDataDir;
   private Path storagePath;
   private ReplicationTasksStorage tasksStorage;
@@ -95,10 +90,9 @@
 
     assertThat(listIncompleteTasks("refs/heads/(mybranch|master)")).hasSize(2);
 
+    isPushCompleted(targetProject, newBranch, TEST_PUSH_TIMEOUT);
     try (Repository repo = repoManager.openRepository(targetProject);
         Repository sourceRepo = repoManager.openRepository(project)) {
-      waitUntil(() -> checkedGetRef(repo, newBranch) != null);
-
       Ref masterRef = getRef(sourceRepo, master);
       Ref targetBranchRef = getRef(repo, newBranch);
       assertThat(targetBranchRef).isNotNull();
@@ -123,9 +117,10 @@
 
     try (Repository repo1 = repoManager.openRepository(targetProject1);
         Repository repo2 = repoManager.openRepository(targetProject2)) {
-      waitUntil(
+      WaitUtil.waitUntil(
           () ->
-              (checkedGetRef(repo1, sourceRef) != null && checkedGetRef(repo2, sourceRef) != null));
+              (checkedGetRef(repo1, sourceRef) != null && checkedGetRef(repo2, sourceRef) != null),
+          TEST_PUSH_TIMEOUT);
 
       Ref targetBranchRef1 = getRef(repo1, sourceRef);
       assertThat(targetBranchRef1).isNotNull();
@@ -193,10 +188,6 @@
     config.save();
   }
 
-  private void waitUntil(Supplier<Boolean> waitCondition) throws InterruptedException {
-    WaitUtil.waitUntil(waitCondition, TEST_TIMEOUT);
-  }
-
   private List<ReplicateRefUpdate> listWaitingTasks(String refRegex) {
     Pattern refmaskPattern = Pattern.compile(refRegex);
     return tasksStorage.listWaiting().stream()