Skip to content

Commit 8579b08

Browse files
fix testing context
1 parent e26e628 commit 8579b08

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

models/repo/mirror_ssh_keypair_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"crypto/ed25519"
88
"testing"
99

10-
"code.gitea.io/gitea/models/db"
1110
repo_model "code.gitea.io/gitea/models/repo"
1211
"code.gitea.io/gitea/models/unittest"
1312
"code.gitea.io/gitea/modules/setting"
@@ -22,7 +21,7 @@ func TestUserSSHKeypair(t *testing.T) {
2221

2322
t.Run("CreateUserSSHKeypair", func(t *testing.T) {
2423
// Test creating a new SSH keypair for a user
25-
keypair, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 1)
24+
keypair, err := repo_model.CreateUserSSHKeypair(t.Context(), 1)
2625
require.NoError(t, err)
2726
assert.NotNil(t, keypair)
2827
assert.Equal(t, int64(1), keypair.OwnerID)
@@ -34,7 +33,7 @@ func TestUserSSHKeypair(t *testing.T) {
3433
assert.Contains(t, keypair.PublicKey, "ssh-ed25519")
3534

3635
// Test creating a keypair for an organization
37-
orgKeypair, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 2)
36+
orgKeypair, err := repo_model.CreateUserSSHKeypair(t.Context(), 2)
3837
require.NoError(t, err)
3938
assert.NotNil(t, orgKeypair)
4039
assert.Equal(t, int64(2), orgKeypair.OwnerID)
@@ -46,18 +45,18 @@ func TestUserSSHKeypair(t *testing.T) {
4645

4746
t.Run("GetUserSSHKeypairByOwner", func(t *testing.T) {
4847
// Create a keypair first
49-
created, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 3)
48+
created, err := repo_model.CreateUserSSHKeypair(t.Context(), 3)
5049
require.NoError(t, err)
5150

5251
// Test retrieving the keypair
53-
retrieved, err := repo_model.GetUserSSHKeypairByOwner(db.DefaultContext, 3)
52+
retrieved, err := repo_model.GetUserSSHKeypairByOwner(t.Context(), 3)
5453
require.NoError(t, err)
5554
assert.Equal(t, created.OwnerID, retrieved.OwnerID)
5655
assert.Equal(t, created.PublicKey, retrieved.PublicKey)
5756
assert.Equal(t, created.Fingerprint, retrieved.Fingerprint)
5857

5958
// Test retrieving non-existent keypair
60-
_, err = repo_model.GetUserSSHKeypairByOwner(db.DefaultContext, 999)
59+
_, err = repo_model.GetUserSSHKeypairByOwner(t.Context(), 999)
6160
assert.ErrorIs(t, err, util.ErrNotExist)
6261
})
6362

@@ -68,7 +67,7 @@ func TestUserSSHKeypair(t *testing.T) {
6867
}
6968

7069
// Create a keypair
71-
keypair, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 4)
70+
keypair, err := repo_model.CreateUserSSHKeypair(t.Context(), 4)
7271
require.NoError(t, err)
7372

7473
// Test decrypting the private key
@@ -84,29 +83,29 @@ func TestUserSSHKeypair(t *testing.T) {
8483

8584
t.Run("DeleteUserSSHKeypair", func(t *testing.T) {
8685
// Create a keypair
87-
_, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 5)
86+
_, err := repo_model.CreateUserSSHKeypair(t.Context(), 5)
8887
require.NoError(t, err)
8988

9089
// Verify it exists
91-
_, err = repo_model.GetUserSSHKeypairByOwner(db.DefaultContext, 5)
90+
_, err = repo_model.GetUserSSHKeypairByOwner(t.Context(), 5)
9291
require.NoError(t, err)
9392

9493
// Delete it
95-
err = repo_model.DeleteUserSSHKeypair(db.DefaultContext, 5)
94+
err = repo_model.DeleteUserSSHKeypair(t.Context(), 5)
9695
require.NoError(t, err)
9796

9897
// Verify it's gone
99-
_, err = repo_model.GetUserSSHKeypairByOwner(db.DefaultContext, 5)
98+
_, err = repo_model.GetUserSSHKeypairByOwner(t.Context(), 5)
10099
assert.ErrorIs(t, err, util.ErrNotExist)
101100
})
102101

103102
t.Run("RegenerateUserSSHKeypair", func(t *testing.T) {
104103
// Create initial keypair
105-
original, err := repo_model.CreateUserSSHKeypair(db.DefaultContext, 6)
104+
original, err := repo_model.CreateUserSSHKeypair(t.Context(), 6)
106105
require.NoError(t, err)
107106

108107
// Regenerate it
109-
regenerated, err := repo_model.RegenerateUserSSHKeypair(db.DefaultContext, 6)
108+
regenerated, err := repo_model.RegenerateUserSSHKeypair(t.Context(), 6)
110109
require.NoError(t, err)
111110

112111
// Verify it's different
@@ -126,7 +125,7 @@ func TestUserSSHKeypairConcurrency(t *testing.T) {
126125

127126
// Test concurrent creation of keypairs to ensure no race conditions
128127
t.Run("ConcurrentCreation", func(t *testing.T) {
129-
ctx := db.DefaultContext
128+
ctx := t.Context()
130129
results := make(chan error, 10)
131130

132131
// Start multiple goroutines creating keypairs for different owners

0 commit comments

Comments
 (0)