github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-23 10:59:25 +00:00
Code Issues Projects Releases Wiki Activity

Work around systemd-resolved's handling of .invalid domains

Browse Source 
... per https://github.com/containers/skopeo/pull/1558 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2022-02-11 00:06:25 +01:00
parent 3be97ce281
commit 23183072fb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration/copy_test.go
View File

@@ -1305,7 +1305,9 @@ func (s *SkopeoSuite) TestFailureCopySrcWithMirrorsUnavailable(c *check.C) {
dir, err := ioutil.TempDir("", "copy-mirror") dir, err := ioutil.TempDir("", "copy-mirror")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
assertSkopeoFails(c, ".*no such host.*", // .invalid domains are, per RFC 6761, supposed to result in NXDOMAIN.
// With systemd-resolved (used only via NSS?), we instead seem to get “Temporary failure in name resolution”
assertSkopeoFails(c, ".*(no such host|Temporary failure in name resolution).*",
"--registries-conf="+regConfFixture, "copy", "docker://invalid.invalid/busybox", "dir:"+dir) "--registries-conf="+regConfFixture, "copy", "docker://invalid.invalid/busybox", "dir:"+dir)
} }
@@ -1321,7 +1323,9 @@ func (s *SkopeoSuite) TestFailureCopySrcWithMirrorAndPrefixUnavailable(c *check.
dir, err := ioutil.TempDir("", "copy-mirror") dir, err := ioutil.TempDir("", "copy-mirror")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
assertSkopeoFails(c, ".*no such host.*", // .invalid domains are, per RFC 6761, supposed to result in NXDOMAIN.
// With systemd-resolved (used only via NSS?), we instead seem to get “Temporary failure in name resolution”
assertSkopeoFails(c, ".*(no such host|Temporary failure in name resolution).*",
"--registries-conf="+regConfFixture, "copy", "docker://gcr.invalid/wrong/prefix/busybox", "dir:"+dir) "--registries-conf="+regConfFixture, "copy", "docker://gcr.invalid/wrong/prefix/busybox", "dir:"+dir)
} }