test(screencast): order the denied-peer assertion through the service and check setup errors

commit: be1f2be4ea6ca3dfaed5ea617f9c96f9a21e5e78
author: brice · 8d ago · 2026-10-14 21:36 UTC
committer: brice · 8d ago · 2026-10-14 21:39 UTC
parent: 0516c4d
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +16 -12

M internal/adapters/screencast/bus_test.go +5 -5


@@ -672,15 +672,15 @@ func TestInventorySignalsGoToAllowedPeersOnly(t *testing.T) {
672	672		t.Fatalf("allowed peer heard %v", seen)
673	673		}
674	674		}
675		-	// A round trip through the service orders the signals before its answer:
676		-	// the denied peer would have heard them by now.
	675	+	// The service's owner goroutine answers in order: a call that it
	676	+	// answers (AccessDenied) comes after any signal it had wrongly directed
	677	+	// to this connection. The handler is active during the call.
677	678		denied.Handle = func(m *zerobus.Message) {
678	679		if m.Member == "WindowsChanged" \|\| m.Member == "MonitorsChanged" {
679	680		t.Errorf("refused peer got %s", m.Member)
680	681		}
681	682		}
682		-	denied.NewCall("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "GetId", "")
683		-	if _, err := denied.Call(); err != nil {
684		-	t.Fatal(err)
	683	+	if name, _ := callErr(denied, nameIntrospect, pathIntrospect, ifaceIntrospect, "GetWindows", "", nil); name != errAccessDenied {
	684	+	t.Fatalf("refused peer: %q", name)
685	685		}
686	686		}

 			t.Fatalf("allowed peer heard %v", seen)
 		}
 	}
-	// A round trip through the service orders the signals before its answer:
+	// The service's owner goroutine answers in order: a call that it
-	// the denied peer would have heard them by now.
+	// answers (AccessDenied) comes after any signal it had wrongly directed
+	// to this connection. The handler is active during the call.
 	denied.Handle = func(m *zerobus.Message) {
 		if m.Member == "WindowsChanged" || m.Member == "MonitorsChanged" {
 			t.Errorf("refused peer got %s", m.Member)
 		}
 	}
-	denied.NewCall("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "GetId", "")
+	if name, _ := callErr(denied, nameIntrospect, pathIntrospect, ifaceIntrospect, "GetWindows", "", nil); name != errAccessDenied {
-	if _, err := denied.Call(); err != nil {
+		t.Fatalf("refused peer: %q", name)
-		t.Fatal(err)
 	}
 }

M internal/adapters/screencast/screenshot_test.go +11 -7


@@ -169,22 +169,26 @@ func TestScreenshotWithoutUsableFileIsNotSuccess(t *testing.T) {
169	169		if err := os.WriteFile(target, []byte("png"), 0o600); err != nil {
170	170		t.Fatal(err)
171	171		}
172		-	for name, mk := range map[string]func(path string){
173		-	"missing": func(string) {},
174		-	"empty": func(path string) { _ = os.WriteFile(path, nil, 0o600) },
175		-	"symlink": func(path string) { _ = os.Symlink(target, path) },
176		-	"dir": func(path string) { _ = os.Mkdir(path, 0o700) },
	172	+	for name, mk := range map[string]func(path string) error{
	173	+	"missing": func(string) error { return nil },
	174	+	"empty": func(path string) error { return os.WriteFile(path, nil, 0o600) },
	175	+	"symlink": func(path string) error { return os.Symlink(target, path) },
	176	+	"dir": func(path string) error { return os.Mkdir(path, 0o700) },
177	177		} {
178	178		t.Run(name, func(t *testing.T) {
179	179		h, c := ready(t, harnessOpts{})
180	180		h.run.EXPECT().Run(mock.Anything, mock.Anything).RunAndReturn(func(_ context.Context, args []string) error {
181		-	mk(args[slices.Index(args, "-file")+1])
	181	+	if err := mk(args[slices.Index(args, "-file")+1]); err != nil {
	182	+	t.Error(err)
	183	+	}
182	184		return nil
183	185		}).Once()
184	186		for _, member := range []string{"Screenshot", "InteractiveScreenshot"} {
185	187		if member == "InteractiveScreenshot" {
186	188		h.run.EXPECT().Run(mock.Anything, mock.Anything).RunAndReturn(func(_ context.Context, args []string) error {
187		-	mk(args[slices.Index(args, "-file")+1])
	189	+	if err := mk(args[slices.Index(args, "-file")+1]); err != nil {
	190	+	t.Error(err)
	191	+	}
188	192		return nil
189	193		}).Once()
190	194		}

 	if err := os.WriteFile(target, []byte("png"), 0o600); err != nil {
 		t.Fatal(err)
 	}
-	for name, mk := range map[string]func(path string){
+	for name, mk := range map[string]func(path string) error{
-		"missing": func(string) {},
+		"missing": func(string) error { return nil },
-		"empty":   func(path string) { _ = os.WriteFile(path, nil, 0o600) },
+		"empty":   func(path string) error { return os.WriteFile(path, nil, 0o600) },
-		"symlink": func(path string) { _ = os.Symlink(target, path) },
+		"symlink": func(path string) error { return os.Symlink(target, path) },
-		"dir":     func(path string) { _ = os.Mkdir(path, 0o700) },
+		"dir":     func(path string) error { return os.Mkdir(path, 0o700) },
 	} {
 		t.Run(name, func(t *testing.T) {
 			h, c := ready(t, harnessOpts{})
 			h.run.EXPECT().Run(mock.Anything, mock.Anything).RunAndReturn(func(_ context.Context, args []string) error {
-				mk(args[slices.Index(args, "-file")+1])
+				if err := mk(args[slices.Index(args, "-file")+1]); err != nil {
+					t.Error(err)
+				}
 				return nil
 			}).Once()
 			for _, member := range []string{"Screenshot", "InteractiveScreenshot"} {
 				if member == "InteractiveScreenshot" {
 					h.run.EXPECT().Run(mock.Anything, mock.Anything).RunAndReturn(func(_ context.Context, args []string) error {
-						mk(args[slices.Index(args, "-file")+1])
+						if err := mk(args[slices.Index(args, "-file")+1]); err != nil {
+							t.Error(err)
+						}
 						return nil
 					}).Once()
 				}