Skip to content

Fix some integration tests #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonesbusy merged 1 commit into from
Jul 23, 2026
+4 −18
Merged

Fix some integration tests #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/test/java/land/oras/DockerIoITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()),
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/land/oras/QuayIoITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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"));
Expand Down
Loading