From cad3cd183424a212d7dd3bfdfefecefaee23c214 Mon Sep 17 00:00:00 2001 From: Devin Carr Date: Mon, 21 Mar 2022 18:37:53 -0700 Subject: [PATCH] Correct h2mux tests on windows without CGO_ENABLED Compression isn't supported without cgo on windows environments so the h2mux tests need to ignore compression. --- h2mux/h2mux_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/h2mux/h2mux_test.go b/h2mux/h2mux_test.go index a28abb59..3d2e2efe 100644 --- a/h2mux/h2mux_test.go +++ b/h2mux/h2mux_test.go @@ -823,7 +823,7 @@ func TestMultipleStreamsWithDictionaries(t *testing.T) { } originMuxMetrics := muxPair.OriginMux.Metrics() - if q > CompressionNone && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { + if q > CompressionNone && CompressionIsSupported() && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { t.Fatalf("Cross-stream compression is expected to give a better compression ratio") } } @@ -952,7 +952,7 @@ func TestSampleSiteWithDictionaries(t *testing.T) { } originMuxMetrics := muxPair.OriginMux.Metrics() - if q > CompressionNone && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { + if q > CompressionNone && CompressionIsSupported() && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { t.Fatalf("Cross-stream compression is expected to give a better compression ratio") } } @@ -985,8 +985,8 @@ func TestLongSiteWithDictionaries(t *testing.T) { assert.NoError(t, errGroup.Wait()) originMuxMetrics := muxPair.OriginMux.Metrics() - if q > CompressionNone && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { - t.Fatalf("Cross-stream compression is expected to give a better compression ratio") + if q > CompressionNone && CompressionIsSupported() && originMuxMetrics.CompBytesBefore.Value() <= 10*originMuxMetrics.CompBytesAfter.Value() { + t.Fatalf("Cross-stream compression (%d) is expected to give a better compression ratio: %d <= %d", q, originMuxMetrics.CompBytesBefore.Value(), 10*originMuxMetrics.CompBytesAfter.Value()) } } }