qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-15 01:20:28 -07:00
Code Releases Activity

time: accept "+01" in TestLoadFixed on OpenBSD

Browse Source 
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>
This commit is contained in:
Dmitri Shuralyov 2024-11-04 17:36:26 -05:00 committed by Gopher Robot
parent 5f88755f43
commit bea9b91f0f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/time/time_test.go
View File

@ -14,6 +14,7 @@ import (
"math/rand" "math/rand"
"os" "os"
"runtime" "runtime"
"slices"
"strings" "strings"
"sync" "sync"
"testing" "testing"
@ -1124,10 +1125,15 @@ func TestLoadFixed(t *testing.T) {
// So GMT+1 corresponds to -3600 in the Go zone, not +3600. // So GMT+1 corresponds to -3600 in the Go zone, not +3600.
name, offset := Now().In(loc).Zone() name, offset := Now().In(loc).Zone()
// The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1" // The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
// on earlier versions; we accept both. (Issue #17276). // on earlier versions; we accept both. (Issue 17276.)
if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 { wantName := []string{"GMT+1", "-01"}
t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d", // The zone abbreviation may be "+01" on OpenBSD. (Issue 69840.)
name, offset, "GMT+1", "-01", -1*60*60) 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)
} }
} }