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 <[email protected]>
RamenDR · Nov 28, 2024 · 5f4621f · 5f4621f
1 parent 8d94cd4
commit 5f4621f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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),
 	}
 }