Fixed MessagePack expectation on serialized timestamp to support ext 8 and fixext 8.

alexlry · alexlry · commit bea58e6dbf99 · 2018-04-09T10:33:51.000+02:00
Signed-off-by: alexlry &lt;alexandre@keymantics.com&gt;
diff --git a/fluent/fluent_test.go b/fluent/fluent_test.go
@@ -210,9 +210,13 @@ func Test_SubSecondPrecision(t *testing.T) {
 		t.Error(err)
 	}
 
-	expected := "\x94\xA3tag\xC7\x08\x00K\x92\u001Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xC0"
+	// 8 bytes timestamp can be represented using ext 8 or fixext 8
+	expected1 := "\x94\xA3tag\xC7\x08\x00K\x92\u001Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xC0"
+	expected2 := "\x94\xa3tag\xD7\x00K\x92\x1Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xc0"
 	actual := string(encodedData)
-	assert.Equal(t, expected, actual)
+	if actual != expected1 && actual != expected2 {
+		t.Errorf("got %x,\n         except %x\n             or %x", actual, expected1, expected2)
+	}
 }
 
 func Test_MarshalAsJSON(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -210,9 +210,13 @@ func Test_SubSecondPrecision(t *testing.T) {`
`210`	`210`	`t.Error(err)`
`211`	`211`	`}`
`212`	`212`
`213`		`- expected := "\x94\xA3tag\xC7\x08\x00K\x92\u001Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xC0"`
	`213`	`+ // 8 bytes timestamp can be represented using ext 8 or fixext 8`
	`214`	`+ expected1 := "\x94\xA3tag\xC7\x08\x00K\x92\u001Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xC0"`
	`215`	`+ expected2 := "\x94\xa3tag\xD7\x00K\x92\x1Ee\x00\x00\x01\x00\x81\xA3foo\xA3bar\xc0"`
`214`	`216`	`actual := string(encodedData)`
`215`		`- assert.Equal(t, expected, actual)`
	`217`	`+ if actual != expected1 && actual != expected2 {`
	`218`	`+ t.Errorf("got %x,\n except %x\n or %x", actual, expected1, expected2)`
	`219`	`+ }`
`216`	`220`	`}`
`217`	`221`
`218`	`222`	`func Test_MarshalAsJSON(t *testing.T) {`