Просмотр исходного кода

wgengine/magicsock: use testingutil.MinAllocsPerRun

This speeds up and deflakes the test.

Fixes #2826 (again)

Signed-off-by: Josh Bleecher Snyder <[email protected]>
Josh Bleecher Snyder 4 лет назад
Родитель
Сommit
c1d377078d
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      wgengine/magicsock/magicsock_test.go

+ 4 - 3
wgengine/magicsock/magicsock_test.go

@@ -44,6 +44,7 @@ import (
 	"tailscale.com/types/wgkey"
 	"tailscale.com/util/cibuild"
 	"tailscale.com/util/racebuild"
+	"tailscale.com/util/testingutil"
 	"tailscale.com/wgengine/filter"
 	"tailscale.com/wgengine/wgcfg"
 	"tailscale.com/wgengine/wgcfg/nmcfg"
@@ -1348,9 +1349,9 @@ func TestReceiveFromAllocs(t *testing.T) {
 	}
 	t.Logf("allowing %d allocs for Go version %q", maxAllocs, runtime.Version())
 	roundTrip := setUpReceiveFrom(t)
-	avg := int(testing.AllocsPerRun(1000, roundTrip))
-	if avg > maxAllocs {
-		t.Fatalf("expected %d allocs in ReceiveFrom, got %v", maxAllocs, avg)
+	err := testingutil.MinAllocsPerRun(t, uint64(maxAllocs), roundTrip)
+	if err != nil {
+		t.Fatal(err)
 	}
 }