Skip to content

fix: resolve duplicate test declarations in server package #3098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 2 commits into from
Apr 3, 2026
+12 −12
Merged

fix: resolve duplicate test declarations in server package #3098

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf23716
fix: resolve duplicate test declarations in server package
lpcox Apr 3, 2026
8937a13
Update internal/server/session_test.go
lpcox Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions internal/server/session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ func TestNewSession_GuardInitNotShared(t *testing.T) {
assert.Empty(t, s2.GuardInit, "s2.GuardInit must not be affected by writes to s1.GuardInit")
}

// newMinimalUnifiedServer creates a UnifiedServer with an empty config for
// newMinimalUnifiedServerForSessionTest creates a UnifiedServer with an empty config for
// use in session-related tests.
func newMinimalUnifiedServer(t *testing.T) *UnifiedServer {
func newMinimalUnifiedServerForSessionTest(t *testing.T) *UnifiedServer {
t.Helper()
cfg := &config.Config{
Servers: map[string]*config.ServerConfig{},
Expand All @@ -155,7 +155,7 @@ func newMinimalUnifiedServer(t *testing.T) *UnifiedServer {
// TestGetSessionID verifies that getSessionID is a thin wrapper around
// SessionIDFromContext, returning the same ID (or "default") for all inputs.
func TestGetSessionID(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)

tests := []struct {
name string
Expand Down Expand Up @@ -200,7 +200,7 @@ func TestGetSessionID(t *testing.T) {
// TestEnsureSessionDirectory verifies that ensureSessionDirectory creates the
// expected per-session subdirectory inside payloadDir.
func TestEnsureSessionDirectory(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)

t.Run("creates session directory under payloadDir", func(t *testing.T) {
us.payloadDir = t.TempDir()
Expand Down Expand Up @@ -231,9 +231,9 @@ func TestEnsureSessionDirectory(t *testing.T) {

// TestRequireSession verifies that requireSession auto-creates a new Session
// the first time a session ID is seen and reuses the same Session on subsequent calls.
func TestRequireSession(t *testing.T) {
func TestRequireSession_SessionManagement(t *testing.T) {
t.Run("auto-creates session for new session ID", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

ctx := context.WithValue(context.Background(), SessionIDContextKey, "brand-new-session")
Expand All @@ -247,7 +247,7 @@ func TestRequireSession(t *testing.T) {
})

t.Run("uses default session ID when none in context", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

require.NoError(t, us.requireSession(context.Background()))
Expand All @@ -260,7 +260,7 @@ func TestRequireSession(t *testing.T) {
})

t.Run("returns same session on repeated calls", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

ctx := context.WithValue(context.Background(), SessionIDContextKey, "stable-session")
Expand All @@ -279,7 +279,7 @@ func TestRequireSession(t *testing.T) {
})

t.Run("concurrent calls create the session exactly once", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

ctx := context.WithValue(context.Background(), SessionIDContextKey, "concurrent-session")
Expand All @@ -306,12 +306,12 @@ func TestRequireSession(t *testing.T) {
// session IDs and is consistent with the sessions map.
func TestGetSessionKeys(t *testing.T) {
t.Run("returns empty slice when no sessions exist", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
assert.Empty(t, us.getSessionKeys())
})

t.Run("returns all session IDs after creation", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

sessionIDs := []string{"session-a", "session-b", "session-c"}
Expand All @@ -326,7 +326,7 @@ func TestGetSessionKeys(t *testing.T) {
})

t.Run("count matches sessions map length", func(t *testing.T) {
us := newMinimalUnifiedServer(t)
us := newMinimalUnifiedServerForSessionTest(t)
us.payloadDir = t.TempDir()

for _, id := range []string{"x", "y", "z"} {
Expand Down
Loading