fix test

Author: wxiaoguang

modules/gitrepo/gitrepo.go

@@ -64,9 +64,7 @@ func RepositoryFromRequestContextOrOpen(ctx context.Context, ds reqctx.RequestDa
 	if err != nil {
 		return nil, err
 	}
-	ds.AddCleanUp(func() {
-		gitRepo.Close()
-	})
+	ds.AddCloser(gitRepo)
 	ds.SetContextValue(ck, gitRepo)
 	return gitRepo, nil
 }

modules/reqctx/datastore.go

@@ -44,9 +44,8 @@ var RequestDataStoreKey requestDataStoreKeyType
 type requestDataStore struct {
 	data ContextData
 
-	mu     sync.RWMutex
-	values map[any]any
-
+	mu           sync.RWMutex
+	values       map[any]any
 	cleanUpFuncs []func()
 }
 
@@ -55,12 +54,8 @@ func (r *requestDataStore) GetContextValue(key any) any {
 		return r
 	}
 	r.mu.RLock()
-	if v, ok := r.values[key]; ok {
-		r.mu.RUnlock()
-		return v
-	}
-	r.mu.RUnlock()
-	return nil
+	defer r.mu.RUnlock()
+	return r.values[key]
 }
 
 func (r *requestDataStore) SetContextValue(k, v any) {
@@ -106,9 +101,6 @@ type requestContext struct {
 }
 
 func (c *requestContext) Value(key any) any {
-	if key == RequestDataStoreKey {
-		return c.dataStore
-	}
 	if v := c.dataStore.GetContextValue(key); v != nil {
 		return v
 	}

services/context/context_test.go

@@ -26,6 +26,7 @@ func TestRemoveSessionCookieHeader(t *testing.T) {
 }
 
 func TestRedirectToCurrentSite(t *testing.T) {
+	setting.IsInTesting = true
 	defer test.MockVariableValue(&setting.AppURL, "http://localhost:3000/sub/")()
 	defer test.MockVariableValue(&setting.AppSubURL, "/sub")()
 	cases := []struct {
@@ -40,7 +41,7 @@ func TestRedirectToCurrentSite(t *testing.T) {
 		t.Run(c.location, func(t *testing.T) {
 			req := &http.Request{URL: &url.URL{Path: "/"}}
 			resp := httptest.NewRecorder()
-			base := NewBaseContext(resp, req)
+			base := NewBaseContextForTest(resp, req)
 			ctx := NewWebContext(base, nil, nil)
 			ctx.RedirectToCurrentSite(c.location)
 			redirect := test.RedirectURL(resp)