From 744827a432662a2aea978e64f8ee683129b21055 Mon Sep 17 00:00:00 2001 From: Valters Jansons Date: Thu, 31 Aug 2023 18:22:48 +0300 Subject: [PATCH] Simplify condition for certificate error Instead of two `expired certificate` and `bad certificate` comparisons, we can just check for `certificate` in error output. This satisfies us when checking there is something wrong with the certificate. Co-authored-by: Scott Blum --- tls_settings_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tls_settings_test.go b/tls_settings_test.go index 831e4c1..b12a251 100644 --- a/tls_settings_test.go +++ b/tls_settings_test.go @@ -213,10 +213,7 @@ func TestBrokenTLS_ClientHasExpiredCert(t *testing.T) { e.Close() t.Fatal("expecting TLS failure setting up server and client") } - // Go 1.21 uses "expired certificate" in the error message. - // Older Go versions use a simpler "bad certificate". - // `runtime.Version()` exists, but we don't want to parse a version String for comparison. - if !strings.Contains(err.Error(), "expired certificate") && !strings.Contains(err.Error(), "bad certificate") { + if !strings.Contains(err.Error(), "certificate") { t.Fatalf("expecting TLS certificate error, got: %v", err) } }