You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/01/10 13:48:57 UTC
[flink] branch release-1.10 updated:
[FLINK-15520][prometheus][tests] Use DownloadCache
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.10 by this push:
new 5e25dc1 [FLINK-15520][prometheus][tests] Use DownloadCache
5e25dc1 is described below
commit 5e25dc1846d45c19069899b6b48c5610f069aef9
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Jan 8 16:20:56 2020 +0100
[FLINK-15520][prometheus][tests] Use DownloadCache
---
.../tests/PrometheusReporterEndToEndITCase.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java
index 9c15bf7..56643b2 100644
--- a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java
+++ b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java
@@ -24,6 +24,7 @@ import org.apache.flink.metrics.prometheus.PrometheusReporter;
import org.apache.flink.tests.util.AutoClosableProcess;
import org.apache.flink.tests.util.CommandLineWrapper;
import org.apache.flink.tests.util.FlinkDistribution;
+import org.apache.flink.tests.util.cache.DownloadCache;
import org.apache.flink.tests.util.categories.TravisGroup1;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.OperatingSystem;
@@ -45,7 +46,6 @@ import org.slf4j.LoggerFactory;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.time.Duration;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -94,6 +94,9 @@ public class PrometheusReporterEndToEndITCase extends TestLogger {
@Rule
public final TemporaryFolder tmp = new TemporaryFolder();
+ @Rule
+ public final DownloadCache downloadCache = DownloadCache.get();
+
@Test
public void testReporter() throws Exception {
dist.copyOptJarsToLib("flink-metrics-prometheus");
@@ -111,14 +114,10 @@ public class PrometheusReporterEndToEndITCase extends TestLogger {
final Path prometheusBinary = prometheusBinDir.resolve("prometheus");
Files.createDirectory(tmpPrometheusDir);
- LOG.info("Downloading Prometheus.");
- AutoClosableProcess
- .create(
- CommandLineWrapper
- .wget("https://github.com/prometheus/prometheus/releases/download/v" + PROMETHEUS_VERSION + '/' + prometheusArchive.getFileName())
- .targetDir(tmpPrometheusDir)
- .build())
- .runBlocking(Duration.ofMinutes(5));
+ downloadCache.getOrDownload(
+ "https://github.com/prometheus/prometheus/releases/download/v" + PROMETHEUS_VERSION + '/' + prometheusArchive.getFileName(),
+ tmpPrometheusDir
+ );
LOG.info("Unpacking Prometheus.");
runBlocking(