Fix context usage in some tests, add metrics processing delay

grafana · Dec 15, 2020 · c12f449 · c12f449
1 parent b0b06c9
commit c12f449
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/api/v1/status_routes_test.go b/api/v1/status_routes_test.go
@@ -103,10 +103,17 @@ func TestPatchStatus(t *testing.T) {
 			require.NoError(t, err)
 			engine, err := core.NewEngine(execScheduler, options, logger)
 			require.NoError(t, err)
-			ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-			defer cancel()
-			run, _, err := engine.Init(ctx, ctx)
+			globalCtx, globalCancel := context.WithTimeout(context.Background(), 2*time.Second)
+			runCtx, runCancel := context.WithCancel(globalCtx)
+			run, waitFn, err := engine.Init(globalCtx, runCtx)
 			require.NoError(t, err)
+			defer func() {
+				runCancel()
+				// Wait for metrics processing to finish
+				time.Sleep(100 * time.Millisecond)
+				globalCancel()
+				waitFn()
+			}()
 
 			go func() { _ = run() }()
 			// wait for the executor to initialize to avoid a potential data race below

diff --git a/core/engine_test.go b/core/engine_test.go
@@ -88,6 +88,8 @@ func newTestEngine( //nolint:golint
 		if runCancel != nil {
 			runCancel()
 		}
+		// Wait for metrics processing to finish
+		time.Sleep(100 * time.Millisecond)
 		globalCancel()
 		waitFn()
 	}