From 6cbef1d786ec6941a385a5ba178e0975eaaadc98 Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@proton.ch>
Date: Mon, 4 Dec 2023 13:32:00 +0100
Subject: [PATCH] test: Improve TestMetadata_JobCorrectlyFinishesAfterCancel

---
 internal/services/syncservice/stage_metadata_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/services/syncservice/stage_metadata_test.go b/internal/services/syncservice/stage_metadata_test.go
index d168a675..b7643396 100644
--- a/internal/services/syncservice/stage_metadata_test.go
+++ b/internal/services/syncservice/stage_metadata_test.go
@@ -102,9 +102,6 @@ func TestMetadataStage_JobCorrectlyFinishesAfterCancel(t *testing.T) {
 	// read one output then cancel
 	request, err := output.Consume(ctx)
 	require.NoError(t, err)
-	request.onFinished(ctx)
-	// cancel job context
-	jobCancel()
 
 	wg := sync.WaitGroup{}
 	wg.Add(1)
@@ -117,10 +114,13 @@ func TestMetadataStage_JobCorrectlyFinishesAfterCancel(t *testing.T) {
 				return
 			}
 
+			// cancel job context
+			jobCancel()
 			req.checkCancelled()
 		}
 	}()
 	wg.Wait()
+	request.onFinished(ctx)
 	err = tj.job.waitAndClose(ctx)
 	require.Error(t, err)
 	require.ErrorIs(t, err, context.Canceled)