Fix failing tests due to wrong context

Author: mihaimitrea-db

cmd/auth/logout_test.go

@@ -1,7 +1,6 @@
 package auth
 
 import (
-	"context"
 	"os"
 	"path/filepath"
 	"testing"
@@ -161,7 +160,7 @@ func TestLogout(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			ctx := cmdio.MockDiscard(context.Background())
+			ctx := cmdio.MockDiscard(t.Context())
 			configPath := writeTempConfig(t, logoutTestConfig)
 			t.Setenv("DATABRICKS_CONFIG_FILE", configPath)
 
@@ -204,7 +203,7 @@ func TestLogout(t *testing.T) {
 }
 
 func TestLogoutNoTokens(t *testing.T) {
-	ctx := cmdio.MockDiscard(context.Background())
+	ctx := cmdio.MockDiscard(t.Context())
 	configPath := writeTempConfig(t, logoutTestConfig)
 	t.Setenv("DATABRICKS_CONFIG_FILE", configPath)
 
@@ -228,7 +227,7 @@ func TestLogoutNoTokens(t *testing.T) {
 }
 
 func TestLogoutNoTokensWithDelete(t *testing.T) {
-	ctx := cmdio.MockDiscard(context.Background())
+	ctx := cmdio.MockDiscard(t.Context())
 	configPath := writeTempConfig(t, logoutTestConfig)
 	t.Setenv("DATABRICKS_CONFIG_FILE", configPath)
 

libs/databrickscfg/ops_test.go

@@ -341,7 +341,7 @@ host = https://only.cloud.databricks.com
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 			path := filepath.Join(t.TempDir(), ".databrickscfg")
 			require.NoError(t, os.WriteFile(path, []byte(tc.seedConfig), fileMode))
 
@@ -367,7 +367,7 @@ host = https://only.cloud.databricks.com
 }
 
 func TestDeleteProfile_NotFound(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	path := filepath.Join(t.TempDir(), ".databrickscfg")
 	require.NoError(t, os.WriteFile(path, []byte(""), fileMode))
 

libs/gorules/rule_context_background.go

@@ -2,17 +2,9 @@ package gorules
 
 import "github.com/quasilyte/go-ruleguard/dsl"
 
-<<<<<<< HEAD
 // NoContextBackground detects context.Background() outside of main.go files.
 func NoContextBackground(m dsl.Matcher) {
 	m.Match(`context.Background()`).
 		Where(!m.File().Name.Matches(`^main\.go$`)).
 		Report(`Do not use context.Background(); use t.Context() in tests or pass context from caller`)
-=======
-// UseTestContext detects context.Background() in test files and suggests using t.Context().
-func UseTestContext(m dsl.Matcher) {
-	m.Match(`context.Background()`).
-		Where(m.File().Name.Matches(`_test\.go$`)).
-		Report(`Use t.Context() or b.Context() in tests instead of context.Background()`)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 }