From 7a95c9f1d34129c3da26e46595e59df57ab320e0 Mon Sep 17 00:00:00 2001
From: Ciara Stacke <c.stacke@f5.com>
Date: Thu, 12 Oct 2023 14:42:22 +0100
Subject: [PATCH] Review feedback

---
 internal/mode/static/nginx/runtime/verify.go  | 21 ++++++++++++-------
 .../mode/static/nginx/runtime/verify_test.go  |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/internal/mode/static/nginx/runtime/verify.go b/internal/mode/static/nginx/runtime/verify.go
index a965b59f7..673b4e1ec 100644
--- a/internal/mode/static/nginx/runtime/verify.go
+++ b/internal/mode/static/nginx/runtime/verify.go
@@ -93,14 +93,7 @@ func (c *verifyClient) waitForCorrectVersion(
 		return fmt.Errorf(noNewWorkersErrFmt, expectedVersion, err)
 	}
 
-	if err := wait.PollUntilContextCancel(
-		ctx,
-		25*time.Millisecond,
-		true, /* poll immediately */
-		func(ctx context.Context) (bool, error) {
-			version, err := c.getConfigVersion()
-			return version == expectedVersion, err
-		}); err != nil {
+	if err := c.ensureConfigVersion(ctx, expectedVersion); err != nil {
 		if errors.Is(err, context.DeadlineExceeded) {
 			err = fmt.Errorf(
 				"config version check didn't return expected version %d within the deadline",
@@ -112,6 +105,18 @@ func (c *verifyClient) waitForCorrectVersion(
 	return nil
 }
 
+func (c *verifyClient) ensureConfigVersion(ctx context.Context, expectedVersion int) error {
+	return wait.PollUntilContextCancel(
+		ctx,
+		25*time.Millisecond,
+		true, /* poll immediately */
+		func(ctx context.Context) (bool, error) {
+			version, err := c.getConfigVersion()
+			return version == expectedVersion, err
+		},
+	)
+}
+
 func ensureNewNginxWorkers(
 	ctx context.Context,
 	childProcFile string,
diff --git a/internal/mode/static/nginx/runtime/verify_test.go b/internal/mode/static/nginx/runtime/verify_test.go
index 92f50e35c..0a5431d59 100644
--- a/internal/mode/static/nginx/runtime/verify_test.go
+++ b/internal/mode/static/nginx/runtime/verify_test.go
@@ -119,7 +119,7 @@ func TestEnsureNewNginxWorkers(t *testing.T) {
 	ctx := context.Background()
 
 	cancellingCtx, cancel := context.WithCancel(ctx)
-	time.AfterFunc(10000*time.Millisecond, cancel)
+	time.AfterFunc(100*time.Millisecond, cancel)
 
 	cancellingCtx2, cancel2 := context.WithCancel(ctx)
 	time.AfterFunc(1*time.Millisecond, cancel2)
@@ -150,7 +150,7 @@ func TestEnsureNewNginxWorkers(t *testing.T) {
 			readFile:         readFilePrevious,
 			previousContents: previousContents,
 			expectError:      true,
-			name:             "no new workers",
+			name:             "timed out waiting for new workers",
 		},
 		{
 			ctx:              cancellingCtx2,