Fix failing tests due to wrong context

Author: mihaimitrea-db

AGENTS.md

@@ -206,11 +206,7 @@ log.Errorf(ctx, "...")
 ```
 
 Note that the 'ctx' variable here is something that should be passed in as
-<<<<<<< HEAD
 an argument by the caller.
-=======
-an argument by the caller. In tests, use `t.Context()` (or `b.Context()` for benchmarks) instead of `context.Background()`. This is enforced by a lint rule.
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 
 Use cmdio.LogString to print to stdout:
 

NEXT_CHANGELOG.md

@@ -6,8 +6,6 @@
 
 ### Bundles
 * Added permissions support for Lakebase Database projects ([#4626](https://github.com/databricks/cli/pull/4626))
-* Validate that either source_code_path or git_source is set for apps ([#4632](https://github.com/databricks/cli/pull/4632))
-* direct: model_serving_endpoints: ignore budget_policy_id, rate_limits changes in the plan. Previously they were ignored as well but action as "update". ([#4638](https://github.com/databricks/cli/pull/4638))
 
 ### Dependency updates
 

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/filer/workspace_files_cache_test.go

@@ -81,11 +81,7 @@ func TestWorkspaceFilesCache_ReadDirCache(t *testing.T) {
 	}
 
 	ctx := t.Context()
-<<<<<<< HEAD
 	cache := newWorkspaceFilesReadaheadCache(ctx, f)
-=======
-	cache := newWorkspaceFilesReadaheadCache(f)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 	defer cache.Cleanup()
 
 	// First read dir should hit the filer, second should hit the cache.
@@ -126,11 +122,7 @@ func TestWorkspaceFilesCache_ReadDirCacheIsolation(t *testing.T) {
 	}
 
 	ctx := t.Context()
-<<<<<<< HEAD
 	cache := newWorkspaceFilesReadaheadCache(ctx, f)
-=======
-	cache := newWorkspaceFilesReadaheadCache(f)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 	defer cache.Cleanup()
 
 	// First read dir should hit the filer, second should hit the cache.
@@ -161,11 +153,7 @@ func TestWorkspaceFilesCache_StatCache(t *testing.T) {
 	}
 
 	ctx := t.Context()
-<<<<<<< HEAD
 	cache := newWorkspaceFilesReadaheadCache(ctx, f)
-=======
-	cache := newWorkspaceFilesReadaheadCache(f)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 	defer cache.Cleanup()
 
 	// First stat should hit the filer, second should hit the cache.
@@ -234,11 +222,7 @@ func TestWorkspaceFilesCache_ReadDirPopulatesStatCache(t *testing.T) {
 	}
 
 	ctx := t.Context()
-<<<<<<< HEAD
 	cache := newWorkspaceFilesReadaheadCache(ctx, f)
-=======
-	cache := newWorkspaceFilesReadaheadCache(f)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 	defer cache.Cleanup()
 
 	// Issue read dir to populate the stat cache.
@@ -305,11 +289,7 @@ func TestWorkspaceFilesCache_ReadDirTriggersReadahead(t *testing.T) {
 	}
 
 	ctx := t.Context()
-<<<<<<< HEAD
 	cache := newWorkspaceFilesReadaheadCache(ctx, f)
-=======
-	cache := newWorkspaceFilesReadaheadCache(f)
->>>>>>> 47d9694f3 (Use t.Context() instead of context.Background() in tests (#4655))
 	defer cache.Cleanup()
 
 	// Issue read dir to populate the stat cache.

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))
 }