diff --git a/src/test/java/land/oras/DockerIoITCase.java b/src/test/java/land/oras/DockerIoITCase.java index 1a419b74..1420e1e3 100644 --- a/src/test/java/land/oras/DockerIoITCase.java +++ b/src/test/java/land/oras/DockerIoITCase.java @@ -22,10 +22,7 @@ import static org.junit.jupiter.api.Assertions.*; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Metrics; import java.nio.file.Path; -import land.oras.utils.Const; import land.oras.utils.ZotUnsecureContainer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -94,10 +91,8 @@ void shouldPullAnonymousIndexUnqualified() { void shouldPullOneBlob() { Registry registry = Registry.builder().build(); ContainerRef containerRef1 = ContainerRef.parse("jbangdev/jbang-action"); - Index index = registry.getIndex(containerRef1); String effectiveRegistry = containerRef1.getEffectiveRegistry(registry); - Manifest manifest = registry.getManifest( - containerRef1.withDigest(index.getManifests().get(0).getDigest())); + Manifest manifest = registry.getManifest(containerRef1); Layer oneLayer = manifest.getLayers().get(0); registry.fetchBlob( containerRef1.forRegistry(effectiveRegistry).withDigest(oneLayer.getDigest()), @@ -125,14 +120,6 @@ void shouldCopyTagToInternalRegistry() { CopyUtils.copy(sourceRegistry, containerSource, targetRegistry, containerTarget, CopyUtils.CopyOptions.deep()); assertTrue(targetRegistry.exists(containerTarget)); - - assertEquals( - 1.0, - Metrics.globalRegistry.find(Const.METRIC_TOKEN_REFRESH).counters().stream() - .mapToDouble(Counter::count) - .sum()); - - TestUtils.dumpMetrics(Metrics.globalRegistry); } @Test diff --git a/src/test/java/land/oras/QuayIoITCase.java b/src/test/java/land/oras/QuayIoITCase.java index 1102e92c..e555a051 100644 --- a/src/test/java/land/oras/QuayIoITCase.java +++ b/src/test/java/land/oras/QuayIoITCase.java @@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import java.io.IOException; import java.nio.file.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -44,16 +43,16 @@ void shouldPullIndex() { void shouldPullManifest() { Registry registry = Registry.builder().build(); ContainerRef containerRef1 = ContainerRef.parse( - "quay.io/openshift/origin-cli@sha256:58b3680e6f8141829412f3010477ed84ebc73da65665dcde988e0b2a1276ae1f"); + "quay.io/openshift/origin-cli@sha256:569ebcccdc62d1dc1a2d01c05fbda49850747243d7afa838cf4601cd9e67e0fd"); Manifest manifest = registry.getManifest(containerRef1); assertNotNull(manifest); } @Test - void shouldPullOneBlob() throws IOException { + void shouldPullOneBlob() { Registry registry = Registry.builder().build(); ContainerRef containerRef1 = ContainerRef.parse( - "quay.io/openshift/origin-cli@sha256:58b3680e6f8141829412f3010477ed84ebc73da65665dcde988e0b2a1276ae1f"); + "quay.io/openshift/origin-cli@sha256:569ebcccdc62d1dc1a2d01c05fbda49850747243d7afa838cf4601cd9e67e0fd"); Manifest manifest = registry.getManifest(containerRef1); Layer oneLayer = manifest.getLayers().get(0); registry.fetchBlob(containerRef1.withDigest(oneLayer.getDigest()), tempDir.resolve("my-blob"));