From 46300ecae8e74e63b6bb73af4dd6c39bb1259ee1 Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@redhat.com>
Date: Tue, 10 Aug 2021 18:27:37 +0200
Subject: [PATCH] cutil: fix race condition in ptrguard tests

The finalizer of an object is called in a separate go routine, so we
might have to check several times for its completion.

Fixes: #545

Signed-off-by: Sven Anderson <sven@redhat.com>
---
 internal/cutil/ptrguard_test.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/internal/cutil/ptrguard_test.go b/internal/cutil/ptrguard_test.go
index df2b582..f424f28 100644
--- a/internal/cutil/ptrguard_test.go
+++ b/internal/cutil/ptrguard_test.go
@@ -4,6 +4,7 @@ import (
 	"math/rand"
 	"runtime"
 	"testing"
+	"time"
 	"unsafe"
 
 	"github.com/stretchr/testify/assert"
@@ -42,7 +43,7 @@ func TestPtrGuard(t *testing.T) {
 		// until the function returns after Release() is called. The test will
 		// fail if the //go:uintptrescapes comment is disabled (removed) or
 		// stops working in future versions of go.
-		var pg_done, u_done bool
+		var pgDone, uDone bool
 		var goPtr = func(b *bool) unsafe.Pointer {
 			s := "ok"
 			runtime.SetFinalizer(&s, func(p *string) { *b = true })
@@ -50,14 +51,16 @@ func TestPtrGuard(t *testing.T) {
 		}
 		cPtr := Malloc(PtrSize)
 		defer Free(cPtr)
-		pg := NewPtrGuard(cPtr, goPtr(&pg_done))
-		u := uintptr(goPtr(&u_done))
+		pg := NewPtrGuard(cPtr, goPtr(&pgDone))
+		u := uintptr(goPtr(&uDone))
 		runtime.GC()
-		assert.True(t, u_done)
-		assert.False(t, pg_done)
+		assert.Eventually(t, func() bool { return uDone },
+			time.Second, 10*time.Millisecond)
+		assert.False(t, pgDone)
 		pg.Release()
 		runtime.GC()
-		assert.True(t, pg_done)
+		assert.Eventually(t, func() bool { return pgDone },
+			time.Second, 10*time.Millisecond)
 		assert.NotZero(t, u) // avoid "unused" error
 	})