opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-01 14:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: fix flake in TestServer/Logging (#27263)

Browse Source 
<!--

If you have used AI to produce some or all of this PR, please ensure you have read our [AI Contribution guidelines](https://coder.com/docs/about/contributing/AI_CONTRIBUTING) before submitting.

-->

fixes https://github.com/coder/internal/issues/1618

same underlying issue as https://github.com/coder/internal/issues/946

Test flakes because main test ends before the server can connect to postrgres and this causes the CLI invocation to return an error we don't care about.
This commit is contained in:
Spike Curtis
2026-07-15 14:39:45 +02:00
committed by GitHub
parent c57d6fcef0
commit ac35e0d3d8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/server_test.go
+7 -7
View File
@@ -232,7 +232,7 @@ func TestServer(t *testing.T) {
const superDuperLong = testutil.WaitSuperLong * 3
ctx := testutil.Context(t, superDuperLong)
clitest.Start(t, inv.WithContext(ctx))
startIgnoringPostgresQueryCancel(t, inv.WithContext(ctx))
//nolint:gocritic // Embedded postgres take a while to fire up.
require.Eventually(t, func() bool {
@@ -332,7 +332,7 @@ func TestServer(t *testing.T) {
)
pty := ptytest.New(t).Attach(inv)
require.NoError(t, pty.Resize(20, 80))
clitest.Start(t, inv)
startIgnoringPostgresQueryCancel(t, inv)
// Wait for startup
_ = waitAccessURL(t, cfg)
@@ -1757,7 +1757,7 @@ func TestServer(t *testing.T) {
"--provisioner-types=echo",
"--log-human", fiName,
)
clitest.Start(t, root)
startIgnoringPostgresQueryCancel(t, root)
loggingWaitFile(t, fiName, testutil.WaitLong)
})
@@ -1776,7 +1776,7 @@ func TestServer(t *testing.T) {
"--provisioner-types=echo",
"--log-human", fi,
)
clitest.Start(t, root)
startIgnoringPostgresQueryCancel(t, root)
loggingWaitFile(t, fi, testutil.WaitShort)
})
@@ -1795,7 +1795,7 @@ func TestServer(t *testing.T) {
"--provisioner-types=echo",
"--log-json", fi,
)
clitest.Start(t, root)
startIgnoringPostgresQueryCancel(t, root)
loggingWaitFile(t, fi, testutil.WaitShort)
})
@@ -2556,7 +2556,7 @@ func TestServer_DisabledDERP_EmptyBaseMap(t *testing.T) {
"--access-url", "http://example.com",
"--derp-server-enable=false",
)
clitest.Start(t, inv.WithContext(ctx))
startIgnoringPostgresQueryCancel(t, inv.WithContext(ctx))
waitAccessURL(t, cfg)
}
@@ -2582,7 +2582,7 @@ func TestServer_DisabledDERP_ExternalMap(t *testing.T) {
"--derp-server-enable=false",
"--derp-config-url", srv.URL,
)
clitest.Start(t, inv.WithContext(ctx))
startIgnoringPostgresQueryCancel(t, inv.WithContext(ctx))
accessURL := waitAccessURL(t, cfg)
derpURL, err := accessURL.Parse("/derp")
require.NoError(t, err)