Skip to content

[pull] main from coder:main #151

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
merged 5 commits into from
Aug 7, 2025
Merged

[pull] main from coder:main #151

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ba5521
test: fix timeout on TestServer_X11_EvictionLRU (#19217)
spikecurtis Aug 7, 2025
ffbd583
fix(site): fix render crash when no embedded apps are defined for tas…
DanielleMaywood Aug 7, 2025
02de067
refactor(site): remove usage of `throw` in `TaskApps.tsx` (#19235)
DanielleMaywood Aug 7, 2025
26458cd
refactor: consolidate template and workspace acl validation (#19192)
aslilac Aug 7, 2025
8ba8b4f
chore: add profiling labels for pprof analysis (#19232)
Emyrk Aug 7, 2025
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
Next Next commit
test: fix timeout on TestServer_X11_EvictionLRU (coder#19217) 
fixes coder/internal#878

On my dev system it takes 900ms, but looking at timestamps in CI it took
25 seconds. Bumping timeout to 60s.

Also fixes the segfault.
  • Loading branch information
@spikecurtis
spikecurtis authored Aug 7, 2025
commit 6ba55213fb5bf192d8ad091a5c708b5f7019589c
6 changes: 4 additions & 2 deletions agent/agentssh/x11_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func TestServer_X11_EvictionLRU(t *testing.T) {
t.Skip("X11 forwarding is only supported on Linux")
}

ctx := testutil.Context(t, testutil.WaitLong)
ctx := testutil.Context(t, testutil.WaitSuperLong)
logger := testutil.Logger(t)
fs := afero.NewMemMapFs()

Expand Down Expand Up @@ -238,7 +238,9 @@ func TestServer_X11_EvictionLRU(t *testing.T) {
payload := "hello world"
go func() {
conn, err := inproc.Dial(ctx, testutil.NewAddr("tcp", fmt.Sprintf("localhost:%d", agentssh.X11StartPort+agentssh.X11DefaultDisplayOffset)))
assert.NoError(t, err)
if !assert.NoError(t, err) {
return
}
_, err = conn.Write([]byte(payload))
assert.NoError(t, err)
_ = conn.Close()
Expand Down