Merge branch 'fix/flaky-capture-syncobj' into main (!14)

test: fix flaky syncobj and capture keyboard tests

commit: 37f59a2137a9674de4682e4dfbb501bef42894b5
author: ermite · 37h ago · 2026-10-21 07:47 UTC
merge of: 4f9bb17 + 0b0d373 · diff against the first parent
signature: SSH VerifiedSHA256:lY9fILbB/A+hln6Vh/iHoiiog74bbw/4qWrf/lrTU3U · ermite instance key Verified for the committer email
checks: 1/1

2 files · +15 -7

M internal/adapters/wayland/syncobj_test.go +3 -1


@@ -443,7 +443,9 @@ func TestSyncobjProtocolErrors(t *testing.T) {
443	443		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorUnsupportedBuffer)},
444	444		{"surface destroyed", func(h *syncHarness) {
445	445		requestProtocol(t, h.c, h.surf, wayland.SurfaceRequestDestroy)
446		-	h.setPoints(1, 2)
	446	+	// The first request already raises the error and the server
	447	+	// then closes the connection: a second write could hit EPIPE.
	448	+	requestProtocol(t, h.c, h.syncSurf, linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1RequestSetAcquirePoint, h.timeline, uint32(0), uint32(1))
447	449		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorNoSurface)},
448	450		{"surface exists", func(h *syncHarness) {
449	451		mgr := bindProtocol(t, h.c, "wp_linux_drm_syncobj_manager_v1")

 		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorUnsupportedBuffer)},
 		{"surface destroyed", func(h *syncHarness) {
 			requestProtocol(t, h.c, h.surf, wayland.SurfaceRequestDestroy)
-			h.setPoints(1, 2)
+			// The first request already raises the error and the server
+			// then closes the connection: a second write could hit EPIPE.
+			requestProtocol(t, h.c, h.syncSurf, linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1RequestSetAcquirePoint, h.timeline, uint32(0), uint32(1))
 		}, func(h *syncHarness) uint32 { return h.syncSurf }, uint32(linuxdrmsyncobj.WpLinuxDrmSyncobjSurfaceV1ErrorNoSurface)},
 		{"surface exists", func(h *syncHarness) {
 			mgr := bindProtocol(t, h.c, "wp_linux_drm_syncobj_manager_v1")

M internal/core/capture_test.go +12 -6


@@ -68,6 +68,16 @@ func (r *captureRig) layer(id ports.WindowID, layer ports.Layer, keyboard uint32
68	68		return ports.LayerSurface{ID: id, Layer: layer, Anchor: ports.AnchorTop \| ports.AnchorLeft, Width: 10, Height: 10, Output: "OUT-1", Keyboard: keyboard}
69	69		}
70	70
	71	+	// drainCommands drops the commands already queued. Call it only once the
	72	+	// core is quiet (after receiving a scene, which is published after its
	73	+	// commands) and before sending the event under test: draining after the
	74	+	// send races with the core emitting the commands the test waits for.
	75	+	func (r *captureRig) drainCommands() {
	76	+	for len(r.commands) > 0 {
	77	+	<-r.commands
	78	+	}
	79	+	}
	80	+
71	81		// excludedScene waits for a scene whose exclusion list has n entries.
72	82		func (r captureRig) excludedScene(t testing.T, n int) ports.Scene {
73	83		t.Helper()

@@ -372,10 +382,8 @@ func TestCaptureExclusionKeyboardClamp(t *testing.T) {
372	382		r.client <- ports.CaptureExclusionBegin{Session: 1}
373	383		r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
374	384		r.excludedScene(t, 1)
	385	+	r.drainCommands()
375	386		r.client <- ports.LayerChanged{Layers: []ports.LayerSurface{r.layer(10, ports.LayerOverlay, 1), r.layer(11, ports.LayerOverlay, 1)}}
376		-	for len(r.commands) > 0 {
377		-	<-r.commands
378		-	}
379	387		scene(t, r.scenes)
380	388		for {
381	389		if f, ok := receive(t, r.commands).(ports.FocusWindow); ok {

@@ -396,9 +404,7 @@ func TestCaptureExclusionKeyboardNone(t *testing.T) {
396	404		r.client <- ports.CaptureExclusionBegin{Session: 1}
397	405		r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
398	406		r.excludedScene(t, 1)
399		-	for len(r.commands) > 0 {
400		-	<-r.commands
401		-	}
	407	+	r.drainCommands()
402	408		r.client <- ports.WindowMapped{ID: 1}
403	409		scene(t, r.scenes)
404	410		for len(r.commands) > 0 {

 	return ports.LayerSurface{ID: id, Layer: layer, Anchor: ports.AnchorTop | ports.AnchorLeft, Width: 10, Height: 10, Output: "OUT-1", Keyboard: keyboard}
 }
+// drainCommands drops the commands already queued. Call it only once the
+// core is quiet (after receiving a scene, which is published after its
+// commands) and before sending the event under test: draining after the
+// send races with the core emitting the commands the test waits for.
+func (r *captureRig) drainCommands() {
+	for len(r.commands) > 0 {
+		<-r.commands
+	}
+}
 // excludedScene waits for a scene whose exclusion list has n entries.
 func (r *captureRig) excludedScene(t *testing.T, n int) ports.Scene {
 	t.Helper()
 	r.client <- ports.CaptureExclusionBegin{Session: 1}
 	r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
 	r.excludedScene(t, 1)
+	r.drainCommands()
 	r.client <- ports.LayerChanged{Layers: []ports.LayerSurface{r.layer(10, ports.LayerOverlay, 1), r.layer(11, ports.LayerOverlay, 1)}}
-	for len(r.commands) > 0 {
-		<-r.commands
-	}
 	scene(t, r.scenes)
 	for {
 		if f, ok := receive(t, r.commands).(ports.FocusWindow); ok {
 	r.client <- ports.CaptureExclusionBegin{Session: 1}
 	r.client <- ports.CaptureExclusionLayer{Session: 1, Layer: 10, Attached: true}
 	r.excludedScene(t, 1)
-	for len(r.commands) > 0 {
+	r.drainCommands()
-		<-r.commands
-	}
 	r.client <- ports.WindowMapped{ID: 1}
 	scene(t, r.scenes)
 	for len(r.commands) > 0 {