mirror of
https://github.com/coder/coder.git
synced 2025-07-13 21:36:50 +00:00
fix: Stop sending additional signals in Shutdown test (#2582)
Coder was exiting before the additional signals were handled, which caused occasional CI failures.
This commit is contained in:
@ -202,25 +202,19 @@ func TestServer(t *testing.T) {
|
|||||||
root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--provisioner-daemons", "1")
|
root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--provisioner-daemons", "1")
|
||||||
serverErr := make(chan error)
|
serverErr := make(chan error)
|
||||||
go func() {
|
go func() {
|
||||||
err := root.ExecuteContext(ctx)
|
serverErr <- root.ExecuteContext(ctx)
|
||||||
serverErr <- err
|
|
||||||
}()
|
}()
|
||||||
require.Eventually(t, func() bool {
|
require.Eventually(t, func() bool {
|
||||||
var err error
|
var err error
|
||||||
_, err = cfg.URL().Read()
|
_, err = cfg.URL().Read()
|
||||||
return err == nil
|
return err == nil
|
||||||
}, 15*time.Second, 25*time.Millisecond)
|
}, 15*time.Second, 25*time.Millisecond)
|
||||||
|
|
||||||
currentProcess, err := os.FindProcess(os.Getpid())
|
currentProcess, err := os.FindProcess(os.Getpid())
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
err = currentProcess.Signal(os.Interrupt)
|
err = currentProcess.Signal(os.Interrupt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
// Send a two more signal, which should be ignored. Send 2 because the channel has a buffer
|
// We cannot send more signals here, because it's possible Coder
|
||||||
// of 1 and we want to make sure that nothing strange happens if we exceed the buffer.
|
// has already exited, which could cause the test to fail due to interrupt.
|
||||||
err = currentProcess.Signal(os.Interrupt)
|
|
||||||
require.NoError(t, err)
|
|
||||||
err = currentProcess.Signal(os.Interrupt)
|
|
||||||
require.NoError(t, err)
|
|
||||||
err = <-serverErr
|
err = <-serverErr
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user