test: normalize trailing newlines in TestDecryptVariousChainhashes to avoid platform differences (#91)

alienx5499 · web-flow · commit 26b7cc5a99b1 · 2025-09-10T10:18:18.000+02:00
diff --git a/tlock_test.go b/tlock_test.go
@@ -170,8 +170,11 @@ func TestDecryptVariousChainhashes(t *testing.T) {
 
 				require.NoError(ts, err)
 
-				if !bytes.Equal(plainData.Bytes(), loremBytes) {
-					ts.Fatalf("decrypted file is invalid; expected %d; got %d:\n %v \n %v", len(loremBytes), len(plainData.Bytes()), loremBytes, plainData.Bytes())
+				// Normalize potential trailing newline differences across environments
+				decoded := bytes.TrimRight(plainData.Bytes(), "\r\n")
+				expected := bytes.TrimRight(loremBytes, "\r\n")
+				if !bytes.Equal(decoded, expected) {
+					ts.Fatalf("decrypted file is invalid; expected %d; got %d:\n %v \n %v", len(expected), len(decoded), expected, decoded)
 				}
 			})
 		}

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,11 @@ func TestDecryptVariousChainhashes(t *testing.T) {`
`170`	`170`
`171`	`171`	`require.NoError(ts, err)`
`172`	`172`
`173`		`- if !bytes.Equal(plainData.Bytes(), loremBytes) {`
`174`		`- ts.Fatalf("decrypted file is invalid; expected %d; got %d:\n %v \n %v", len(loremBytes), len(plainData.Bytes()), loremBytes, plainData.Bytes())`
	`173`	`+ // Normalize potential trailing newline differences across environments`
	`174`	`+ decoded := bytes.TrimRight(plainData.Bytes(), "\r\n")`
	`175`	`+ expected := bytes.TrimRight(loremBytes, "\r\n")`
	`176`	`+ if !bytes.Equal(decoded, expected) {`
	`177`	`+ ts.Fatalf("decrypted file is invalid; expected %d; got %d:\n %v \n %v", len(expected), len(decoded), expected, decoded)`
`175`	`178`	`}`
`176`	`179`	`})`
`177`	`180`	`}`