From 66a47930f160216c7e021ede113a5d7ea281dfe3 Mon Sep 17 00:00:00 2001
From: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Date: Thu, 19 Dec 2024 09:06:01 -0800
Subject: [PATCH] Revert "internal/daemon: speed up multi-worker tests (#5370)"

Unfortunately, this started causing the enterprise tests to break in
an unexpected way. Reverting to spend some more time testing the changes.
---
 internal/daemon/worker/testing.go | 67 +++++++------------------------
 1 file changed, 15 insertions(+), 52 deletions(-)

diff --git a/internal/daemon/worker/testing.go b/internal/daemon/worker/testing.go
index 7083becb7b..db47dece74 100644
--- a/internal/daemon/worker/testing.go
+++ b/internal/daemon/worker/testing.go
@@ -456,6 +456,9 @@ func NewTestMultihopWorkers(t testing.TB,
 	})
 	t.Cleanup(kmsWorker.Shutdown)
 
+	// Give time for it to be inserted into the database
+	time.Sleep(2 * time.Second)
+
 	// names should not be set when using pki workers
 	pkiWorkerConf, err := config.DevWorker()
 	require.NoError(err)
@@ -473,6 +476,9 @@ func NewTestMultihopWorkers(t testing.TB,
 	})
 	t.Cleanup(pkiWorker.Shutdown)
 
+	// Give time for it to be inserted into the database
+	time.Sleep(2 * time.Second)
+
 	// Get a server repo and worker auth repo
 	serversRepo, err := serversRepoFn()
 	require.NoError(err)
@@ -507,6 +513,9 @@ func NewTestMultihopWorkers(t testing.TB,
 	})
 	t.Cleanup(childPkiWorker.Shutdown)
 
+	// Give time for it to be inserted into the database
+	time.Sleep(2 * time.Second)
+
 	// Perform initial authentication of worker to controller
 	reqBytes, err = base58.FastBase58Decoding(childPkiWorker.Worker().WorkerAuthRegistrationRequest)
 	require.NoError(err)
@@ -539,62 +548,16 @@ func NewTestMultihopWorkers(t testing.TB,
 		WorkerAuthDebuggingEnabled: enableAuthDebugging,
 		DisableAutoStart:           true,
 	})
-	t.Cleanup(childKmsWorker.Shutdown)
 	childKmsWorker.w.conf.WorkerAuthStorageKms = nil
 
 	err = childKmsWorker.w.Start()
-	require.NoError(err)
+	t.Cleanup(childKmsWorker.Shutdown)
+	if err != nil {
+		t.Fatal(err)
+	}
 
-	t.Log("Waiting for workers to start up")
-	require.Eventually(
-		func() bool {
-			t.Log("Checking worker status")
-			workers, err := serversRepo.ListWorkers(controllerContext, []string{"global"})
-			if err != nil {
-				return false
-			}
-			if len(workers) != 4 {
-				return false
-			}
-			for _, w := range workers {
-				if w.LastStatusTime == nil {
-					return false
-				}
-			}
-			return true
-		},
-		30*time.Second,
-		time.Second,
-	)
-	t.Log("All workers have started")
-
-	t.Cleanup(func() {
-		// Run shutdowns in parallel, they each take multiple seconds
-		// Note: this duplicates the shutdowns above, but since shutdowns
-		// are idempotent, that's OK. This is the first time we can safely run them
-		// all in parallel.
-		t.Log("Shutting down workers")
-		wg := &sync.WaitGroup{}
-		wg.Add(4)
-		go func() {
-			defer wg.Done()
-			kmsWorker.Shutdown()
-		}()
-		go func() {
-			defer wg.Done()
-			pkiWorker.Shutdown()
-		}()
-		go func() {
-			defer wg.Done()
-			childPkiWorker.Shutdown()
-		}()
-		go func() {
-			defer wg.Done()
-			childKmsWorker.Shutdown()
-		}()
-		wg.Wait()
-		t.Log("Workers shut down")
-	})
+	// Sleep so that workers can startup and connect.
+	time.Sleep(12 * time.Second)
 
 	return kmsWorker, pkiWorker, childPkiWorker, childKmsWorker
 }