use t.Context() in tests

On-behalf-of: @SAP [email protected]

Author: xrstf

internal/sync/context_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package sync
 
 import (
-	"context"
 	"testing"
 
 	"github.com/kcp-dev/logicalcluster/v3"
@@ -27,9 +26,9 @@ import (
 
 func TestNewContext(t *testing.T) {
 	clusterName := logicalcluster.Name("foo")
-	ctx := kontext.WithCluster(context.Background(), clusterName)
+	ctx := kontext.WithCluster(t.Context(), clusterName)
 
-	combinedCtx := NewContext(context.Background(), ctx)
+	combinedCtx := NewContext(t.Context(), ctx)
 
 	if combinedCtx.clusterName != clusterName {
 		t.Fatalf("Expected function to recognize the cluster name in the context, but got %q", combinedCtx.clusterName)

internal/sync/state_store_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package sync
 
 import (
-	"context"
 	"testing"
 
 	dummyv1alpha1 "github.com/kcp-dev/api-syncagent/internal/sync/apis/dummy/v1alpha1"
@@ -37,7 +36,7 @@ func TestStateStoreBasics(t *testing.T) {
 	}, withKind("RemoteThing"))
 
 	serviceClusterClient := buildFakeClient()
-	ctx := context.Background()
+	ctx := t.Context()
 	stateNamespace := "kcp-system"
 
 	primaryObjectSide := syncSide{

internal/sync/syncer_test.go

@@ -907,7 +907,7 @@ func TestSyncerProcessingSingleResourceWithoutStatus(t *testing.T) {
 				t.Fatalf("Failed to create syncer: %v", err)
 			}
 
-			localCtx := context.Background()
+			localCtx := t.Context()
 			remoteCtx := kontext.WithCluster(localCtx, clusterName)
 			ctx := NewContext(localCtx, remoteCtx)
 
@@ -1213,7 +1213,7 @@ func TestSyncerProcessingSingleResourceWithStatus(t *testing.T) {
 				t.Fatalf("Failed to create syncer: %v", err)
 			}
 
-			localCtx := context.Background()
+			localCtx := t.Context()
 			remoteCtx := kontext.WithCluster(localCtx, clusterName)
 			ctx := NewContext(localCtx, remoteCtx)
 

test/e2e/apiexport/apiexport_test.go

@@ -45,7 +45,7 @@ func TestPermissionsClaims(t *testing.T) {
 		apiExportName = "kcp.example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -247,7 +247,7 @@ func TestExistingPermissionsClaimsAreKept(t *testing.T) {
 		apiExportName = "kcp.example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -367,7 +367,7 @@ func TestSchemasAreMerged(t *testing.T) {
 		apiExportName = "kcp.example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -476,7 +476,7 @@ func TestSchemaIsKeptWhenDeletingPublishedResource(t *testing.T) {
 		apiExportName = "kcp.example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -614,7 +614,7 @@ func TestNewSchemasAreCreatedAsNeeded(t *testing.T) {
 		apiExportName = "kcp.example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp

test/e2e/apiresourceschema/apiresourceschema_test.go

@@ -45,7 +45,7 @@ func TestARSAreCreated(t *testing.T) {
 		apiExportName = "example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -116,7 +116,7 @@ func TestARSAreNotUpdated(t *testing.T) {
 		apiExportName = "example.com"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -214,7 +214,7 @@ func TestARSOnlyContainsSelectedCRDVersion(t *testing.T) {
 		theVersion    = "v1"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -296,7 +296,7 @@ func TestMultiVersionCRD(t *testing.T) {
 	// force a non-standard order, because it should not matter for the sync
 	var selectedVersions = []string{"v2", "v1"}
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -386,7 +386,7 @@ func TestProjection(t *testing.T) {
 		originalVersion = "v1"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -489,7 +489,7 @@ func TestNonCRDResource(t *testing.T) {
 		originalVersion = "v1"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp

test/e2e/discovery/discovery_test.go

@@ -19,7 +19,6 @@ limitations under the License.
 package discovery
 
 import (
-	"context"
 	"testing"
 
 	"github.com/go-logr/logr"
@@ -95,7 +94,7 @@ func TestDiscoverSingleVersionCRD(t *testing.T) {
 
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 			ctrlruntime.SetLogger(logr.Discard())
 
 			kubeconfigFile, _, _ := utils.RunEnvtest(t, testcase.crdFiles)

test/e2e/sync/primary_test.go

@@ -53,7 +53,7 @@ func TestSyncSimpleObject(t *testing.T) {
 		orgWorkspace  = "sync-simple"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -143,7 +143,7 @@ func TestSyncSimpleObjectOldNaming(t *testing.T) {
 		orgWorkspace  = "sync-simple-deprecated"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -232,7 +232,7 @@ func TestSyncWithDefaultNamingRules(t *testing.T) {
 		orgWorkspace  = "sync-default-naming-rules"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -327,7 +327,7 @@ func TestLocalChangesAreKept(t *testing.T) {
 		orgWorkspace  = "sync-undo-local-changes"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -533,7 +533,7 @@ func TestResourceFilter(t *testing.T) {
 		orgWorkspace  = "sync-resource-filter"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
@@ -654,7 +654,7 @@ func TestSyncingOverlyLongNames(t *testing.T) {
 		orgWorkspace  = "sync-long-names"
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp

test/e2e/sync/related_test.go

@@ -457,7 +457,7 @@ func TestSyncRelatedObjects(t *testing.T) {
 
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 
 			// setup a test environment in kcp
 			orgKubconfig := utils.CreateOrganization(t, ctx, testcase.workspace, apiExportName)