Skip to content

Commit e67d375

Browse files
authored
Update ContainerRef.shouldDetermineEffectiveRegistry test to not be machine dependent (#596)
Signed-off-by: Valentin Delaye <jonesbusy@users.noreply.github.com>
1 parent aa5d9e6 commit e67d375

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

src/test/java/land/oras/ContainerRefTest.java

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,27 +151,28 @@ void shouldRewriteAllSubdomainToLocalProxy(@TempDir Path homeDir) throws Excepti
151151
@Execution(ExecutionMode.SAME_THREAD)
152152
void shouldDetermineEffectiveRegistry(@TempDir Path homeDir) throws Exception {
153153

154-
// Use from container ref
155-
Registry registry = Registry.builder().defaults().build();
156-
ContainerRef containerRef = ContainerRef.parse("docker.io/library/foo/alpine:latest@sha256:1234567890abcdef");
157-
assertEquals("docker.io", containerRef.getEffectiveRegistry(registry));
158-
159-
// Took from registry
160-
assertEquals("foo.io", containerRef.forRegistry("foo.io").getEffectiveRegistry(registry));
161-
162-
// Unqualified with registry
163-
Registry registryWithRegistry =
164-
Registry.builder().defaults().withRegistry("foo.io").build();
165-
ContainerRef unqualifiedWithRegistryRef = ContainerRef.parse("library/foo/alpine:latest");
166-
assertEquals("foo.io", unqualifiedWithRegistryRef.getEffectiveRegistry(registryWithRegistry));
167-
168154
// language=toml
169155
// Ensure empty config does not cause error with machine contains default registry
170156
String config = "";
171-
172157
TestUtils.createRegistriesConfFile(homeDir, config);
173158

174159
TestUtils.withHome(homeDir, () -> {
160+
161+
// Use from container ref
162+
Registry registry = Registry.builder().defaults().build();
163+
ContainerRef containerRef =
164+
ContainerRef.parse("docker.io/library/foo/alpine:latest@sha256:1234567890abcdef");
165+
assertEquals("docker.io", containerRef.getEffectiveRegistry(registry));
166+
167+
// Took from registry
168+
assertEquals("foo.io", containerRef.forRegistry("foo.io").getEffectiveRegistry(registry));
169+
170+
// Unqualified with registry
171+
Registry registryWithRegistry =
172+
Registry.builder().defaults().withRegistry("foo.io").build();
173+
ContainerRef unqualifiedWithRegistryRef = ContainerRef.parse("library/foo/alpine:latest");
174+
assertEquals("foo.io", unqualifiedWithRegistryRef.getEffectiveRegistry(registryWithRegistry));
175+
175176
Registry r = Registry.builder().defaults().build();
176177

177178
// Unqualified without config use docker.io

0 commit comments

Comments
 (0)