From ba8ff3bb2b146afbc119c1edfff6f8d46fa5ab6e Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 28 Nov 2024 02:30:30 +0200 Subject: [PATCH] e2e: Add per-test logger to test.Context This will be used to log errors during the test flow, and once we pass the context to all utility functions, they will be able to use the right logger instead of passing log argument everywhere. Signed-off-by: Nir Soffer --- e2e/exhaustive_suite_test.go | 2 +- e2e/test/context.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/e2e/exhaustive_suite_test.go b/e2e/exhaustive_suite_test.go index fd421bf9a..83fee0bb3 100644 --- a/e2e/exhaustive_suite_test.go +++ b/e2e/exhaustive_suite_test.go @@ -80,7 +80,7 @@ func Exhaustive(t *testing.T) { for _, deployer := range Deployers { for _, workload := range Workloads { - ctx := test.NewContext(workload, deployer) + ctx := test.NewContext(workload, deployer, util.Ctx.Log) t.Run(ctx.Name, func(t *testing.T) { t.Parallel() runTestFlow(t, ctx) diff --git a/e2e/test/context.go b/e2e/test/context.go index b7579755a..789a0de73 100644 --- a/e2e/test/context.go +++ b/e2e/test/context.go @@ -6,6 +6,7 @@ package test import ( "testing" + "github.com/go-logr/logr" "github.com/ramendr/ramen/e2e/deployers" "github.com/ramendr/ramen/e2e/dractions" "github.com/ramendr/ramen/e2e/workloads" @@ -15,15 +16,17 @@ type Context struct { Workload workloads.Workload Deployer deployers.Deployer Name string + Log logr.Logger } -func NewContext(w workloads.Workload, d deployers.Deployer) Context { +func NewContext(w workloads.Workload, d deployers.Deployer, log logr.Logger) Context { name := deployers.GetCombinedName(d, w) return Context{ Workload: w, Deployer: d, Name: name, + Log: log.WithName(name), } }