Merge pull request 'test: fix two flaky tests seen in CI' (#19) from fix/flaky-tests into main

Reviewed-on: https://git.bnema.dev/bnema/neferwl/pulls/19

2 files · +18 -5

M internal/adapters/config/watch_test.go +14 -4


@@ -81,10 +81,20 @@ func TestWatch(t *testing.T) {
81	81		time.Sleep(15 * time.Millisecond)
82	82		}
83	83		receive("#00ff00")
84		-	select {
85		-	case <-out:
86		-	t.Fatal("duplicate reload")
87		-	case <-time.After(250 * time.Millisecond):
	84	+	// A loaded machine may pause past the debounce inside the burst
	85	+	// and reload the truncated file in between: that is a change, not a
	86	+	// duplicate. Only the same config sent twice in a row is one.
	87	+	prev := "#00ff00"
	88	+	for quiet := false; !quiet; {
	89	+	select {
	90	+	case c := <-out:
	91	+	if c.Config.Background.Color == prev {
	92	+	t.Fatal("duplicate reload")
	93	+	}
	94	+	prev = c.Config.Background.Color
	95	+	case <-time.After(250 * time.Millisecond):
	96	+	quiet = true
	97	+	}
88	98		}
89	99		// An invalid value keeps the default for that key; other keys still apply.
90	100		write(path, "background = bad\nborder.width = 5\n")

 				time.Sleep(15 * time.Millisecond)
 			}
 			receive("#00ff00")
-			select {
+			// A loaded machine may pause past the debounce inside the burst
-			case <-out:
+			// and reload the truncated file in between: that is a change, not a
-				t.Fatal("duplicate reload")
+			// duplicate. Only the same config sent twice in a row is one.
-			case <-time.After(250 * time.Millisecond):
+			prev := "#00ff00"
+			for quiet := false; !quiet; {
+				select {
+				case c := <-out:
+					if c.Config.Background.Color == prev {
+						t.Fatal("duplicate reload")
+					}
+					prev = c.Config.Background.Color
+				case <-time.After(250 * time.Millisecond):
+					quiet = true
+				}
 			}
 			// An invalid value keeps the default for that key; other keys still apply.
 			write(path, "background = bad\nborder.width = 5\n")

M internal/adapters/wayland/activation_test.go +4 -1


@@ -163,8 +163,11 @@ func TestActivationPressSerial(t *testing.T) {
163	163		token = newToken(t, c, manager, serial+100, seat)
164	164		requestProtocol(t, c, manager, xdgactivation.ActivationV1RequestActivate, token, surf)
165	165		noActivation(t, c, events)
166		-	// The focus moved after the press: stale.
	166	+	// The focus moved after the press: stale. Wait for each step: the
	167	+	// focus starts at 0, so a single wait could pass before either
	168	+	// command applies and leave the client focused.
167	169		commands <- ports.FocusWindow{ID: w.ID}
	170	+	waitFocus(t, s, w.ID)
168	171		commands <- ports.FocusWindow{}
169	172		waitFocus(t, s, 0)
170	173		token = newToken(t, c, manager, serial, seat)

 	token = newToken(t, c, manager, serial+100, seat)
 	requestProtocol(t, c, manager, xdgactivation.ActivationV1RequestActivate, token, surf)
 	noActivation(t, c, events)
-	// The focus moved after the press: stale.
+	// The focus moved after the press: stale. Wait for each step: the
+	// focus starts at 0, so a single wait could pass before either
+	// command applies and leave the client focused.
 	commands <- ports.FocusWindow{ID: w.ID}
+	waitFocus(t, s, w.ID)
 	commands <- ports.FocusWindow{}
 	waitFocus(t, s, 0)
 	token = newToken(t, c, manager, serial, seat)