test(app): make kill-all shutdown wait resilient

commit: 8a9dd9565fc3fb4a013dfb3d9f5340253b9e35d5
author: brice · 2mo ago · 2026-07-29 05:35 UTC
parent: c0af074
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +10 -6

M internal/app/daemon_integration_test.go +10 -6


@@ -1220,10 +1220,14 @@ func TestIntegration_KillAllShutsDownDaemon(t *testing.T) {
1220	1220
1221	1221		_, err = killTr.Recv()
1222	1222		require.ErrorIs(t, err, io.EOF)
1223		-	select {
1224		-	case err := <-served:
1225		-	require.NoError(t, err)
1226		-	case <-time.After(5 * time.Second):
1227		-	t.Fatal("daemon did not shut down after kill all")
1228		-	}
	1223	+	var serveErr error
	1224	+	require.Eventually(t, func() bool {
	1225	+	select {
	1226	+	case serveErr = <-served:
	1227	+	return true
	1228	+	default:
	1229	+	return false
	1230	+	}
	1231	+	}, 15time.Second, 10time.Millisecond, "daemon did not shut down after kill all")
	1232	+	require.NoError(t, serveErr)
1229	1233		}


@@ -1220,10 +1220,14 @@ func TestIntegration_KillAllShutsDownDaemon(t *testing.T) {
1220			1220
1221		_, err = killTr.Recv()	1221		_, err = killTr.Recv()
1222		require.ErrorIs(t, err, io.EOF)	1222		require.ErrorIs(t, err, io.EOF)
1223	-	select {	1223	+	var serveErr error
1224	-	case err := <-served:	1224	+	require.Eventually(t, func() bool {
1225	-	require.NoError(t, err)	1225	+	select {
1226	-	case <-time.After(5 * time.Second):	1226	+	case serveErr = <-served:
1227	-	t.Fatal("daemon did not shut down after kill all")	1227	+	return true
1228	-	}	1228	+	default:
			1229	+	return false
			1230	+	}
			1231	+	}, 15time.Second, 10time.Millisecond, "daemon did not shut down after kill all")
			1232	+	require.NoError(t, serveErr)
1229		}	1233		}