[Pkg-golang-commits] [golang] 01/01: Apply changes from origtargz extract...

Tianon Gravi tianon at debian.org
Fri Dec 2 21:30:10 UTC 2016


This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch golang-1.7
in repository golang.

commit 870d85fe76621ffab335790ae56218d630f90495
Author: Tianon Gravi <tianon at debian.org>
Date:   Fri Dec 2 13:29:53 2016 -0800

    Apply changes from origtargz extract...
---
 src/time/time_test.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/time/time_test.go b/src/time/time_test.go
index c9665ea..b7ebb37 100644
--- a/src/time/time_test.go
+++ b/src/time/time_test.go
@@ -939,11 +939,8 @@ func TestLoadFixed(t *testing.T) {
 	// but Go and most other systems use "east is positive".
 	// 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)
+	if name != "GMT+1" || offset != -1*60*60 {
+		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q, %d", name, offset, "GMT+1", -1*60*60)
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git



More information about the pkg-golang-commits mailing list