health: fix TestControlHealthNotifies on release branches

Currently, TestControlHealthNotifies expects three initial health-change
events, including is-using-unstable-version, regardless of whether tests run
on an unstable or release branch.

This change makes the is-using-unstable-version check conditional.

Fixes #17635

Signed-off-by: Nick Khyl <nickk@tailscale.com>
nickkhyl/healthnotify-on-release
Nick Khyl 1 month ago
parent 8576a802ca
commit f018a16540
No known key found for this signature in database

@ -741,11 +741,18 @@ func TestControlHealthNotifies(t *testing.T) {
// Expect events at starup, before doing anything else
synctest.Wait()
if err := eventbustest.ExpectExactly(tw,
initialEvents := []any{
eventbustest.Type[Change](), // warming-up
eventbustest.Type[Change](), // is-using-unstable-version
}
if version.IsUnstableBuild() {
initialEvents = append(initialEvents,
eventbustest.Type[Change](), // is-using-unstable-version
)
}
initialEvents = append(initialEvents,
eventbustest.Type[Change](), // not-in-map-poll
); err != nil {
)
if err := eventbustest.ExpectExactly(tw, initialEvents...); err != nil {
t.Errorf("startup error: %v", err)
}

Loading…
Cancel
Save