From 747f5440bc18492a63eb91cba7db72b16c96176d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 10 Feb 2021 01:01:37 +0100 Subject: device: retry Up() in up/down test We're loosing our ownership of the port when bringing the device down, which means another test process could reclaim it. Avoid this by retrying for 4 seconds. Signed-off-by: Jason A. Donenfeld --- device/device_test.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'device') diff --git a/device/device_test.go b/device/device_test.go index c17b350..02b1c35 100644 --- a/device/device_test.go +++ b/device/device_test.go @@ -8,6 +8,7 @@ package device import ( "bytes" "encoding/hex" + "errors" "fmt" "io/ioutil" "math/rand" @@ -16,6 +17,7 @@ import ( "runtime/pprof" "sync" "sync/atomic" + "syscall" "testing" "time" @@ -211,8 +213,17 @@ func TestUpDown(t *testing.T) { go func(d *Device) { defer wg.Done() for i := 0; i < itrials; i++ { - if err := d.Up(); err != nil { - t.Errorf("failed up bring up device: %v", err) + start := time.Now() + for { + if err := d.Up(); err != nil { + if errors.Is(err, syscall.EADDRINUSE) && time.Now().Sub(start) < time.Second*4 { + // Some other test process is racing with us, so try again. + time.Sleep(time.Millisecond * 10) + continue + } + t.Errorf("failed up bring up device: %v", err) + } + break } time.Sleep(time.Duration(rand.Intn(int(time.Nanosecond * (0x10000 - 1))))) if err := d.Down(); err != nil { -- cgit v1.2.3-59-g8ed1b