fix: fix hang in test worker

formancehq · Dec 20, 2024 · 18f9f1c · 18f9f1c
1 parent 1930e92
commit 18f9f1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/testserver/server.go b/pkg/testserver/server.go
@@ -198,6 +198,8 @@ func (s *Server) Start() error {
 	}()
 
 	select {
+	case <-ctx.Done():
+		return errors.New("unexpected context cancel before server ready")
 	case <-service.Ready(ctx):
 	case err := <-s.errorChan:
 		cancel()

diff --git a/pkg/testserver/worker.go b/pkg/testserver/worker.go
@@ -23,6 +23,7 @@ func NewWorker(configuration Configuration, logger Logger) *Worker {
 	return &Worker{
 		configuration: configuration,
 		logger:        logger,
+		errorChan:     make(chan error, 1),
 	}
 }
 
@@ -45,7 +46,13 @@ func (w *Worker) Start(args []string) error {
 	ctx = service.ContextWithLifecycle(ctx)
 	ctx, cancel := context.WithCancel(ctx)
 
+	go func() {
+		w.errorChan <- rootCmd.ExecuteContext(ctx)
+	}()
+
 	select {
+	case <-ctx.Done():
+		return errors.New("unexpected context cancel before worker ready")
 	case <-service.Ready(ctx):
 	case err := <-w.errorChan:
 		cancel()