context propagation: explicit ctx parameter in unit tests (#3229)

crowdsecurity · Sep 19, 2024 · 7c5d4d8 · 7c5d4d8
1 parent b14201a
commit 7c5d4d8
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 87 deletions.
diff --git a/pkg/acquisition/modules/loki/loki_test.go b/pkg/acquisition/modules/loki/loki_test.go
@@ -95,7 +95,6 @@ query: >
 			delayFor:    1 * time.Second,
 		},
 		{
-
 			config: `
 mode: tail
 source: loki
@@ -111,7 +110,6 @@ query: >
 			testName:    "Correct config with password",
 		},
 		{
-
 			config: `
 mode: tail
 source: loki
@@ -261,7 +259,7 @@ func TestConfigureDSN(t *testing.T) {
 	}
 }
 
-func feedLoki(logger *log.Entry, n int, title string) error {
+func feedLoki(ctx context.Context, logger *log.Entry, n int, title string) error {
 	streams := LogStreams{
 		Streams: []LogStream{
 			{
@@ -286,7 +284,7 @@ func feedLoki(logger *log.Entry, n int, title string) error {
 		return err
 	}
 
-	req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:3100/loki/api/v1/push", bytes.NewBuffer(buff))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, "http://127.0.0.1:3100/loki/api/v1/push", bytes.NewBuffer(buff))
 	if err != nil {
 		return err
 	}
@@ -344,12 +342,13 @@ since: 1h
 		subLogger := logger.WithField("type", "loki")
 		lokiSource := loki.LokiSource{}
 		err := lokiSource.Configure([]byte(ts.config), subLogger, configuration.METRICS_NONE)
-
 		if err != nil {
 			t.Fatalf("Unexpected error : %s", err)
 		}
 
-		err = feedLoki(subLogger, 20, title)
+		ctx := context.Background()
+
+		err = feedLoki(ctx, subLogger, 20, title)
 		if err != nil {
 			t.Fatalf("Unexpected error : %s", err)
 		}
@@ -421,6 +420,8 @@ query: >
 		},
 	}
 
+	ctx := context.Background()
+
 	for _, ts := range tests {
 		t.Run(ts.name, func(t *testing.T) {
 			logger := log.New()
@@ -472,7 +473,7 @@ query: >
 				}
 			})
 
-			err = feedLoki(subLogger, ts.expectedLines, title)
+			err = feedLoki(ctx, subLogger, ts.expectedLines, title)
 			if err != nil {
 				t.Fatalf("Unexpected error : %s", err)
 			}
@@ -525,7 +526,9 @@ query: >
 
 	time.Sleep(time.Second * 2)
 
-	err = feedLoki(subLogger, 1, title)
+	ctx := context.Background()
+
+	err = feedLoki(ctx, subLogger, 1, title)
 	if err != nil {
 		t.Fatalf("Unexpected error : %s", err)
 	}