test(protocol): require complete headless feedback and data-device bind

commit: 4bb8af06a47765165a745336b285035bc9a60ecc
author: brice · 24d ago · 2026-09-28 08:00 UTC
parent: 090bcc4
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +8 -4

M protocol/headless_test.go +8 -4


@@ -103,6 +103,8 @@ func TestHeadlessNeferWL(t *testing.T) {
103	103		}
104	104		syncManager := drmsyncobj.NewWpLinuxDrmSyncobjManager(d.Context())
105	105		bind(drmsyncobj.WpLinuxDrmSyncobjManagerInterface, 1, syncManager)
	106	+	dataManager := core.NewDataDeviceManager(d.Context())
	107	+	bind(core.DataDeviceManagerInterface, 4, dataManager)
106	108		vp := viewporter.NewWpViewporter(d.Context())
107	109		bind(viewporter.WpViewporterInterface, 1, vp)
108	110		if g, ok := d.Registry().FindGlobal(fractionalscale.WpFractionalScaleManagerInterface); ok {

@@ -127,19 +129,20 @@ func TestHeadlessNeferWL(t *testing.T) {
127	129		noerr(t, e)
128	130		ss, e := syncManager.GetSurface(surface)
129	131		noerr(t, e)
130		-	configured, done := false, false
	132	+	configured, done, mainDevice, tableOK := false, false, false, false
131	133		top.OnConfigure(func(w, h int32, states []byte) { t.Logf("xdg_toplevel.configure %dx%d", w, h) })
132	134		xs.OnConfigure(func(serial uint32) {
133	135		noerr(t, xs.AckConfigure(serial))
134	136		configured = true
135	137		t.Logf("xdg_surface.configure ack=%d", serial)
136	138		})
137		-	feedback.OnMainDevice(func(b []byte) { t.Logf("main_device=%x", b) })
	139	+	feedback.OnMainDevice(func(b []byte) { mainDevice = len(b) == 8; t.Logf("main_device=%x", b) })
138	140		feedback.OnFormatTable(func(fd *wlturbo.OwnedFD, size uint32) {
139	141		entries, e := linuxdmabuf.ReadFormatTable(fd, size)
140	142		if e != nil {
141	143		t.Errorf("format table: %v", e)
142	144		} else {
	145	+	tableOK = len(entries) > 0
143	146		t.Logf("format-table entries=%d", len(entries))
144	147		}
145	148		})

@@ -151,8 +154,8 @@ func TestHeadlessNeferWL(t *testing.T) {
151	154		t.Fatalf("dispatch: %v\n%s", e, headlessLog(log))
152	155		}
153	156		}
154		-	if !configured \|\| !done {
155		-	t.Fatalf("configure=%t feedback=%t: %v\n%s", configured, done, ctx.Err(), headlessLog(log))
	157	+	if !configured \|\| !done \|\| !mainDevice \|\| !tableOK {
	158	+	t.Fatalf("configure=%t feedback=%t main_device=%t table=%t: %v\n%s", configured, done, mainDevice, tableOK, ctx.Err(), headlessLog(log))
156	159		}
157	160		noerr(t, surface.Commit())
158	161		// Drop all child objects while their parents are still alive.

@@ -162,6 +165,7 @@ func TestHeadlessNeferWL(t *testing.T) {
162	165		noerr(t, xs.Destroy())
163	166		noerr(t, surface.Destroy())
164	167		noerr(t, vp.Destroy())
	168	+	noerr(t, dataManager.Release())
165	169		noerr(t, syncManager.Destroy())
166	170		noerr(t, dm.Destroy())
167	171		noerr(t, wm.Destroy())

 	}
 	syncManager := drmsyncobj.NewWpLinuxDrmSyncobjManager(d.Context())
 	bind(drmsyncobj.WpLinuxDrmSyncobjManagerInterface, 1, syncManager)
+	dataManager := core.NewDataDeviceManager(d.Context())
+	bind(core.DataDeviceManagerInterface, 4, dataManager)
 	vp := viewporter.NewWpViewporter(d.Context())
 	bind(viewporter.WpViewporterInterface, 1, vp)
 	if g, ok := d.Registry().FindGlobal(fractionalscale.WpFractionalScaleManagerInterface); ok {
 	noerr(t, e)
 	ss, e := syncManager.GetSurface(surface)
 	noerr(t, e)
-	configured, done := false, false
+	configured, done, mainDevice, tableOK := false, false, false, false
 	top.OnConfigure(func(w, h int32, states []byte) { t.Logf("xdg_toplevel.configure %dx%d", w, h) })
 	xs.OnConfigure(func(serial uint32) {
 		noerr(t, xs.AckConfigure(serial))
 		configured = true
 		t.Logf("xdg_surface.configure ack=%d", serial)
 	})
-	feedback.OnMainDevice(func(b []byte) { t.Logf("main_device=%x", b) })
+	feedback.OnMainDevice(func(b []byte) { mainDevice = len(b) == 8; t.Logf("main_device=%x", b) })
 	feedback.OnFormatTable(func(fd *wlturbo.OwnedFD, size uint32) {
 		entries, e := linuxdmabuf.ReadFormatTable(fd, size)
 		if e != nil {
 			t.Errorf("format table: %v", e)
 		} else {
+			tableOK = len(entries) > 0
 			t.Logf("format-table entries=%d", len(entries))
 		}
 	})
 			t.Fatalf("dispatch: %v\n%s", e, headlessLog(log))
 		}
 	}
-	if !configured || !done {
+	if !configured || !done || !mainDevice || !tableOK {
-		t.Fatalf("configure=%t feedback=%t: %v\n%s", configured, done, ctx.Err(), headlessLog(log))
+		t.Fatalf("configure=%t feedback=%t main_device=%t table=%t: %v\n%s", configured, done, mainDevice, tableOK, ctx.Err(), headlessLog(log))
 	}
 	noerr(t, surface.Commit())
 	// Drop all child objects while their parents are still alive.
 	noerr(t, xs.Destroy())
 	noerr(t, surface.Destroy())
 	noerr(t, vp.Destroy())
+	noerr(t, dataManager.Release())
 	noerr(t, syncManager.Destroy())
 	noerr(t, dm.Destroy())
 	noerr(t, wm.Destroy())