Skip to content

Commit

Permalink
Work around systemd-resolved's handling of .invalid domains
Browse files Browse the repository at this point in the history
... per containers#1558 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
  • Loading branch information
mtrmac committed Feb 10, 2022
1 parent eb1067a commit 438453a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions integration/copy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,9 @@ func (s *SkopeoSuite) TestFailureCopySrcWithMirrorsUnavailable(c *check.C) {
dir, err := ioutil.TempDir("", "copy-mirror")
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)
}

Expand All @@ -1321,7 +1323,9 @@ func (s *SkopeoSuite) TestFailureCopySrcWithMirrorAndPrefixUnavailable(c *check.
dir, err := ioutil.TempDir("", "copy-mirror")
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)
}

Expand Down

0 comments on commit 438453a

Please # to comment.