time: accept "+01" in TestLoadFixed on OpenBSD

This stops the test from failing with a known failure mode, and
creates time to look into what the next steps should be, if any.

For #69840.

Change-Id: I060903d256ed65c5dfcd70ae76eb361cab63186f
Cq-Include-Trybots: luci.golang.try:gotip-openbsd-amd64
Reviewed-on: https://go-review.googlesource.com/c/go/+/625197
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Eric Grosse <grosse@gmail.com>

diff --git a/src/time/time_test.go b/src/time/time_test.go
index 88b8f7fa0dceae8874cf4e27f83aebdc0c39b3f6..2d719acde279d5da6837869ba908cb0447a7a064 100644 (file)
--- a/src/time/time_test.go
+++ b/src/time/time_test.go
@@ -14,6 +14,7 @@ import (
        "math/rand"
        "os"
        "runtime"
+       "slices"
        "strings"
        "sync"
        "testing"
@@ -1124,10 +1125,15 @@ func TestLoadFixed(t *testing.T) {
        // So GMT+1 corresponds to -3600 in the Go zone, not +3600.
        name, offset := Now().In(loc).Zone()
        // The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
-       // on earlier versions; we accept both. (Issue #17276).
-       if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 {
-               t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d",
-                       name, offset, "GMT+1", "-01", -1*60*60)
+       // on earlier versions; we accept both. (Issue 17276.)
+       wantName := []string{"GMT+1", "-01"}
+       // The zone abbreviation may be "+01" on OpenBSD. (Issue 69840.)
+       if runtime.GOOS == "openbsd" {
+               wantName = append(wantName, "+01")
+       }
+       if !slices.Contains(wantName, name) || offset != -1*60*60 {
+               t.Errorf("Now().In(loc).Zone() = %q, %d, want %q (one of), %d",
+                       name, offset, wantName, -1*60*60)
        }
 }