diff --git a/server/finding_verification_decode_test.go b/server/finding_verification_decode_test.go index 2666744..f4c9432 100644 --- a/server/finding_verification_decode_test.go +++ b/server/finding_verification_decode_test.go @@ -59,16 +59,27 @@ func decodeSnapshot(t *testing.T, respHead string, raw []byte) (*evidence.Store, } func TestDecodeEvidenceBodyGzipQuoteFound(t *testing.T) { - raw := gzipBody(t, []byte(decodeHTML)) - if strings.Contains(string(raw), "admin") { - t.Fatal("fixture is not compressed") + // A body of a few dozen bytes is not worth deflating: some encoders emit a + // stored block instead, and then the round trip below tests nothing. Give + // the fixture enough redundancy that any encoder compresses it, and assert + // the compression itself by size rather than by looking for a word in the + // output: a stored block is larger than its input by construction, so size + // states the real invariant without assuming how a particular flate version + // picks between stored and compressed blocks (#276). + body := strings.Repeat(decodeHTML, 200) + raw := gzipBody(t, []byte(body)) + if !bytes.HasPrefix(raw, []byte{0x1f, 0x8b}) { + t.Fatal("fixture is not gzip") + } + if len(raw) >= len(body)/2 { + t.Fatalf("fixture is not compressed: %d bytes in, %d bytes out", len(body), len(raw)) } out, truncated, err := decodeEvidenceBody(decodeGzipHead, raw, verificationReadCap) if err != nil || truncated { t.Fatalf("decode: truncated=%v err=%v", truncated, err) } - if string(out) != decodeHTML { - t.Fatalf("decoded %q, want %q", out, decodeHTML) + if !bytes.Equal(out, []byte(body)) { + t.Fatalf("decoded %d bytes, want the %d byte body", len(out), len(body)) } if !strings.Contains(normalizeEvidenceText(string(out)), normalizeEvidenceText(decodeQuote)) { t.Fatalf("quote %q not found in decoded body", decodeQuote)