Merge pull request #882 from jordanlewis/fix-inf-test

maddyblue · web-flow · commit a921722df8cf · 2019-07-16T00:26:05.000-06:00
bugfix to infinity timestamp test
diff --git a/encode_test.go b/encode_test.go
@@ -322,7 +322,7 @@ func TestInfinityTimestamp(t *testing.T) {
 	// try to assert []byte to time.Time
 	for _, q := range tc {
 		err = db.QueryRow(q.Query, q.Param).Scan(&resultT)
-		if !q.ExpectedErrorStrRegexp.MatchString(err.Error()) {
+		if err == nil || !q.ExpectedErrorStrRegexp.MatchString(err.Error()) {
 			t.Errorf("Scanning -/+infinity, expected error to match regexp %q, got %q",
 				q.ExpectedErrorStrRegexp, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ func TestInfinityTimestamp(t *testing.T) {`
`322`	`322`	`// try to assert []byte to time.Time`
`323`	`323`	`for _, q := range tc {`
`324`	`324`	`err = db.QueryRow(q.Query, q.Param).Scan(&resultT)`
`325`		`- if !q.ExpectedErrorStrRegexp.MatchString(err.Error()) {`
	`325`	`+ if err == nil \|\| !q.ExpectedErrorStrRegexp.MatchString(err.Error()) {`
`326`	`326`	`t.Errorf("Scanning -/+infinity, expected error to match regexp %q, got %q",`
`327`	`327`	`q.ExpectedErrorStrRegexp, err)`
`328`	`328`	`}`