diff options
Diffstat (limited to 'src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java')
-rw-r--r-- | src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java | 20 |
1 files changed, 12 insertions, 8 deletions
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 41f93b3..9cf5489 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java @@ -42,7 +42,6 @@ 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.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; @@ -400,18 +399,23 @@ public class ReplicationIT extends LightweightPluginDaemonTest { private List<ReplicateRefUpdate> listReplicationTasks(String refRegex) { Pattern refmaskPattern = Pattern.compile(refRegex); - return Stream.concat( - tasksStorage.listWaiting().stream(), - Stream.concat( - tasksStorage.listBuilding().stream(), tasksStorage.listRunning().stream())) + return tasksStorage.list().stream() .filter(task -> refmaskPattern.matcher(task.ref).matches()) .collect(toList()); } - private void cleanupReplicationTasks() throws IOException { - try (DirectoryStream<Path> files = Files.newDirectoryStream(storagePath)) { + public void cleanupReplicationTasks() throws IOException { + cleanupReplicationTasks(storagePath); + } + + private void cleanupReplicationTasks(Path basePath) throws IOException { + try (DirectoryStream<Path> files = Files.newDirectoryStream(basePath)) { for (Path path : files) { - path.toFile().delete(); + if (Files.isDirectory(path)) { + cleanupReplicationTasks(path); + } else { + path.toFile().delete(); + } } } } |