test(adapters): wait for focus and skip truncated reads in timing-sensitive tests (#8)

2 files · +14 -12

M internal/adapters/config/watch_test.go +12 -6


@@ -50,15 +50,21 @@ func TestWatch(t *testing.T) {
50	50		}
51	51		}
52	52		write(path, "background = #000000\n")
	53	+	// receive waits for want. A slow machine may pause longer than the
	54	+	// debounce between WriteFile's truncation and its write: the
	55	+	// watcher then reads an empty file first, which is skipped here.
53	56		receive := func(want string) {
54	57		t.Helper()
55		-	select {
56		-	case c := <-out:
57		-	if c.Config.Background.Color != want {
58		-	t.Fatalf("color %s, want %s", c.Config.Background.Color, want)
	58	+	deadline := time.After(time.Second)
	59	+	for {
	60	+	select {
	61	+	case c := <-out:
	62	+	if c.Config.Background.Color == want {
	63	+	return
	64	+	}
	65	+	case <-deadline:
	66	+	t.Fatalf("no config change to %s", want)
59	67		}
60		-	case <-time.After(time.Second):
61		-	t.Fatal("no config change")
62	68		}
63	69		}
64	70		receive("#000000")

 				}
 			}
 			write(path, "background = #000000\n")
+			// receive waits for want. A slow machine may pause longer than the
+			// debounce between WriteFile's truncation and its write: the
+			// watcher then reads an empty file first, which is skipped here.
 			receive := func(want string) {
 				t.Helper()
-				select {
+				deadline := time.After(time.Second)
-				case c := <-out:
+				for {
-					if c.Config.Background.Color != want {
+					select {
-						t.Fatalf("color %s, want %s", c.Config.Background.Color, want)
+					case c := <-out:
+						if c.Config.Background.Color == want {
+							return
+						}
+					case <-deadline:
+						t.Fatalf("no config change to %s", want)
 					}
-				case <-time.After(time.Second):
-					t.Fatal("no config change")
 				}
 			}
 			receive("#000000")

M internal/adapters/wayland/activation_test.go +2 -6


@@ -95,9 +95,7 @@ func TestActivationNeedsFocusedRequester(t *testing.T) {
95	95
96	96		// The focused client's token activates, once.
97	97		commands <- ports.FocusWindow{ID: first.ID}
98		-	if err := c.Roundtrip(); err != nil {
99		-	t.Fatal(err)
100		-	}
	98	+	waitFocus(t, s, first.ID)
101	99		token = newToken(t, c, manager)
102	100		requestProtocol(t, c, manager, xdgactivation.ActivationV1RequestActivate, token, surf)
103	101		activated(t, events, second.ID)

@@ -120,9 +118,7 @@ func TestActivationAcrossClients(t *testing.T) {
120	118		managerA := bindProtocol(t, a, "xdg_activation_v1")
121	119		managerB := bindProtocol(t, b, "xdg_activation_v1")
122	120		commands <- ports.FocusWindow{ID: winA.ID}
123		-	if err := a.Roundtrip(); err != nil {
124		-	t.Fatal(err)
125		-	}
	121	+	waitFocus(t, s, winA.ID)
126	122		token := newToken(t, b, managerB)
127	123		requestProtocol(t, b, managerB, xdgactivation.ActivationV1RequestActivate, token, surfB)
128	124		noActivation(t, b, events)

 	// The focused client's token activates, once.
 	commands <- ports.FocusWindow{ID: first.ID}
-	if err := c.Roundtrip(); err != nil {
+	waitFocus(t, s, first.ID)
-		t.Fatal(err)
-	}
 	token = newToken(t, c, manager)
 	requestProtocol(t, c, manager, xdgactivation.ActivationV1RequestActivate, token, surf)
 	activated(t, events, second.ID)
 	managerA := bindProtocol(t, a, "xdg_activation_v1")
 	managerB := bindProtocol(t, b, "xdg_activation_v1")
 	commands <- ports.FocusWindow{ID: winA.ID}
-	if err := a.Roundtrip(); err != nil {
+	waitFocus(t, s, winA.ID)
-		t.Fatal(err)
-	}
 	token := newToken(t, b, managerB)
 	requestProtocol(t, b, managerB, xdgactivation.ActivationV1RequestActivate, token, surfB)
 	noActivation(t, b, events)