Bump mocktime to v1.1.0 and fix synchronization issue in cache test.

Author: nathan-osman

cache/cache.go

@@ -8,10 +8,6 @@ import (
 	"github.com/nitroshare/golist"
 )
 
-// This channel is used by the testing suite for synchronization; it is
-// normally set to nil and otherwise has no effect on the package
-var chanTest chan any
-
 type recordEntry struct {
 	record   *Record
 	triggers *golist.List[time.Time]
@@ -34,17 +30,11 @@ func (c *Cache) run() {
 	for {
 		select {
 		case <-c.nextTrigger():
-			if chanTest != nil {
-				chanTest <- nil
-			}
 		case r, ok := <-c.chanAdd:
 			if !ok {
 				return
 			}
 			c.add(r)
-			if chanTest != nil {
-				chanTest <- nil
-			}
 		}
 	}
 }

cache/cache_test.go

@@ -2,15 +2,10 @@ package cache
 
 import (
 	"testing"
-	"time"
 
 	"github.com/nitroshare/mocktime"
 )
 
-func init() {
-	chanTest = make(chan any)
-}
-
 func TestRecordQueryExpiry(t *testing.T) {
 	mocktime.Mock()
 	defer mocktime.Unmock()
@@ -22,14 +17,13 @@ func TestRecordQueryExpiry(t *testing.T) {
 			ChanExpired: chanExpired,
 		})
 	)
-	r := &Record{
-		TTL: 10,
+	c.Add(&Record{
+		TTL: 1,
+	})
+	for range 4 {
+		mocktime.AdvanceToAfter()
+		<-chanQuery
 	}
-	c.Add(r)
-	mocktime.Advance(6 * time.Second)
-	<-chanTest
-	<-chanQuery
-	mocktime.Advance(5 * time.Second)
-	<-chanTest
+	mocktime.AdvanceToAfter()
 	<-chanExpired
 }

go.mod

@@ -4,11 +4,11 @@ go 1.23.0
 
 require (
 	github.com/miekg/dns v1.1.67
-	github.com/nitroshare/mocktime v1.0.5
+	github.com/nitroshare/golist v1.0.2
+	github.com/nitroshare/mocktime v1.1.0
 )
 
 require (
-	github.com/nitroshare/golist v1.0.2 // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/net v0.40.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect

go.sum

@@ -6,8 +6,8 @@ github.com/nitroshare/compare v1.0.1 h1:vnlCEflz1O/6hZ+/HYwaBJB0OG4xRX2eIX0lVb1W
 github.com/nitroshare/compare v1.0.1/go.mod h1:YnsFVZura0jowTncpTZtdciU1qdP3nthsqLAc5ql5F4=
 github.com/nitroshare/golist v1.0.2 h1:GKwazg8PqSp8hiwWTsTFzRu86haDCcIZruVb2dqaXeQ=
 github.com/nitroshare/golist v1.0.2/go.mod h1:jJhoY4v2aiz2WYKSYE6/9OxnAEm2Nz6I4ZKmM/oDJgU=
-github.com/nitroshare/mocktime v1.0.5 h1:ZGDTqCMDgL4u7dkRe26uMjHDaUo2AJBGMTE8Bnx9KPM=
-github.com/nitroshare/mocktime v1.0.5/go.mod h1:c6uMhYj4nXSlAspYJBIzHyV4Tm0fRTgZBRI0eZ43/ME=
+github.com/nitroshare/mocktime v1.1.0 h1:PIk00wDw4hNF8M1/Rpr3FidtjeZ39TNl6aP//k3OevQ=
+github.com/nitroshare/mocktime v1.1.0/go.mod h1:c6uMhYj4nXSlAspYJBIzHyV4Tm0fRTgZBRI0eZ43/ME=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=