From e35315b67f0e606daf421a1b6c90631654513b4e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 20 Jul 2023 23:32:16 -0400 Subject: [PATCH] mantle/kola: simplify logic in ParseDenyListYaml With the introduction of warn: true the logic gets complicated. This is an attempt to simplify the logic and handle all corner cases. --- mantle/kola/harness.go | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go index 57f7f8cb64..88587440a5 100644 --- a/mantle/kola/harness.go +++ b/mantle/kola/harness.go @@ -449,37 +449,39 @@ func ParseDenyListYaml(pltfrm string) error { continue } + // Process "special" patterns which aren't test names, but influence overall behavior + if obj.Pattern == SkipConsoleWarningsTag { + SkipConsoleWarnings = true + continue + } + if obj.SnoozeDate != "" { snoozeDate, err := time.Parse(snoozeFormat, obj.SnoozeDate) if err != nil { return err } if today.After(snoozeDate) { - if !obj.Warn { - continue + fmt.Printf("⏰ Snooze for kola test pattern \"%s\" expired on %s\n", obj.Pattern, snoozeDate.Format("Jan 02 2006")) + if obj.Warn { + fmt.Printf("⚠️ Will warn on failure for kola test pattern \"%s\":\n", obj.Pattern) + WarnOnErrorTests = append(WarnOnErrorTests, obj.Pattern) } - fmt.Printf("⚠️ Warning kola test pattern \"%s\", snoozing expired on %s:\n", obj.Pattern, snoozeDate.Format("Jan 02 2006")) - WarnOnErrorTests = append(WarnOnErrorTests, obj.Pattern) } else { - fmt.Printf("🕒 Snoozing kola test pattern \"%s\" until %s:\n", obj.Pattern, snoozeDate.Format("Jan 02 2006")) + fmt.Printf("🕒 Snoozing kola test pattern \"%s\" until %s\n", obj.Pattern, snoozeDate.Format("Jan 02 2006")) + DenylistedTests = append(DenylistedTests, obj.Pattern) } - } else if obj.Warn { - fmt.Printf("⚠️ Will warn on failure for kola test pattern \"%s\":\n", obj.Pattern) - WarnOnErrorTests = append(WarnOnErrorTests, obj.Pattern) } else { - fmt.Printf("⏭️ Skipping kola test pattern \"%s\":\n", obj.Pattern) + if obj.Warn { + fmt.Printf("⚠️ Will warn on failure for kola test pattern \"%s\":\n", obj.Pattern) + WarnOnErrorTests = append(WarnOnErrorTests, obj.Pattern) + } else { + fmt.Printf("⏭️ Skipping kola test pattern \"%s\":\n", obj.Pattern) + DenylistedTests = append(DenylistedTests, obj.Pattern) + } } - if obj.Tracker != "" { fmt.Printf(" 👉 %s\n", obj.Tracker) } - - /// Process "special" patterns which aren't test names, but influence overall behavior - if obj.Pattern == SkipConsoleWarningsTag { - SkipConsoleWarnings = true - } else if !obj.Warn { - DenylistedTests = append(DenylistedTests, obj.Pattern) - } } return nil