From c4df56a7aa555749cf504ee550d15ad0e2c287f5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 5 May 2026 19:03:46 +0200 Subject: [PATCH] daemon/libnetwork: waitForLocalDNSServer: rm error-type assert Similar to 943f46c425c0916296f5478d0aa3de6c660c9bbd; slight change in behavior, because previously, other errors would not be retried, but also didn't mark the check as failed. Signed-off-by: Sebastiaan van Stijn --- daemon/libnetwork/resolver_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/daemon/libnetwork/resolver_test.go b/daemon/libnetwork/resolver_test.go index c31b73075b..6ead7995f5 100644 --- a/daemon/libnetwork/resolver_test.go +++ b/daemon/libnetwork/resolver_test.go @@ -124,15 +124,12 @@ func waitForLocalDNSServer(t *testing.T) { tconn, err := net.DialTimeout("tcp", "127.0.0.1:53", 10*time.Second) retries = retries + 1 if err != nil { - if oerr, ok := err.(*net.OpError); ok { + if errors.Is(err, syscall.ECONNREFUSED) { // server is probably initializing - if errors.Is(oerr.Err, syscall.ECONNREFUSED) { - continue - } - } else { - // something is wrong: we should stop for analysis - t.Fatal(err) + continue } + // something is wrong: we should stop for analysis + t.Fatal(err) } if tconn != nil { tconn.Close()