test: small test optimizations

Author: 0xERR0R

redis/redis_test.go

@@ -151,7 +151,7 @@ var _ = Describe("Redis client", func() {
 				Eventually(func() map[string]int {
 					return redisServer.PubSubNumSub(SyncChannelName)
 				}).Should(HaveLen(1))
-			}, SpecTimeout(time.Second*6))
+			}, SpecTimeout(time.Second*3))
 		})
 	})
 
@@ -225,7 +225,7 @@ var _ = Describe("Redis client", func() {
 				Eventually(func() chan *CacheMessage {
 					return redisClient.CacheChannel
 				}).Should(HaveLen(lenE + 1))
-			}, SpecTimeout(time.Second*6))
+			}, SpecTimeout(time.Second*3))
 		})
 		When("wrong data is received", func() {
 			It("should not propagate the message over the channel if data is wrong", func(ctx context.Context) {
@@ -258,7 +258,7 @@ var _ = Describe("Redis client", func() {
 				Eventually(func() chan *CacheMessage {
 					return redisClient.CacheChannel
 				}).Should(HaveLen(lenC))
-			}, SpecTimeout(time.Second*6))
+			}, SpecTimeout(time.Second*3))
 			It("should not propagate the message over the channel if type is wrong", func(ctx context.Context) {
 				redisClient, err = New(ctx, redisConfig)
 				Expect(err).Should(Succeed())
@@ -282,16 +282,15 @@ var _ = Describe("Redis client", func() {
 				rec := redisServer.Publish(SyncChannelName, string(binMsg))
 				Expect(rec).Should(Equal(1))
 
-				time.Sleep(2 * time.Second)
+				// Use Consistently to verify channels don't receive invalid messages
+				Consistently(func() int {
+					return len(redisClient.EnabledChannel)
+				}, "200ms", "50ms").Should(Equal(lenE))
 
-				Eventually(func() chan *EnabledMessage {
-					return redisClient.EnabledChannel
-				}).Should(HaveLen(lenE))
-
-				Eventually(func() chan *CacheMessage {
-					return redisClient.CacheChannel
-				}).Should(HaveLen(lenC))
-			}, SpecTimeout(time.Second*6))
+				Consistently(func() int {
+					return len(redisClient.CacheChannel)
+				}, "200ms", "50ms").Should(Equal(lenC))
+			}, SpecTimeout(time.Second*3))
 		})
 	})
 

resolver/query_logging_resolver_test.go

@@ -31,7 +31,7 @@ type SlowMockWriter struct {
 func (m *SlowMockWriter) Write(entry *querylog.LogEntry) {
 	m.entries = append(m.entries, entry)
 
-	time.Sleep(time.Second)
+	time.Sleep(100 * time.Millisecond)
 }
 
 func (m *SlowMockWriter) CleanUp() {
@@ -364,7 +364,7 @@ var _ = Describe("QueryLoggingResolver", func() {
 					Expect(ierr).Should(Succeed())
 
 					return len(sut.logChan)
-				}, "20s", "1µs").Should(Equal(cap(sut.logChan)))
+				}, "3s", "1µs").Should(Equal(cap(sut.logChan)))
 			})
 		})
 	})

server/server_test.go

@@ -697,7 +697,8 @@ var _ = Describe("Running DNS server", func() {
 				// start server
 				go server.Start(ctx, errChan)
 
-				time.Sleep(100 * time.Millisecond)
+				// Wait for server to start successfully (no errors)
+				Consistently(errChan, "200ms").ShouldNot(Receive())
 
 				err = server.Stop(ctx)