From c0d4d5b20c34d15fc19bde08faa977ab0c2dbee4 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 23 Apr 2019 13:42:57 -0400 Subject: [PATCH] Accept buildah 1.7.3+ unused build arg error Buildah 1.7.3 changed how it warns about unused build args, changing a "[Warning] One or more build-args %v were not consumed\n" format string into "[Warning] one or more build args were not consumed: %v\n". Accept either version. Signed-off-by: Nalin Dahyabhai --- test/extended/builds/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/builds/start.go b/test/extended/builds/start.go index 7f7344a8ee3c..a84b9745f1a2 100644 --- a/test/extended/builds/start.go +++ b/test/extended/builds/start.go @@ -347,7 +347,7 @@ var _ = g.Describe("[Feature:Builds][Slow] starting a build using CLI", func() { buildLog, err := br.Logs() o.Expect(err).NotTo(o.HaveOccurred()) g.By("verifying the build completed with a warning.") - o.Expect(buildLog).To(o.ContainSubstring("One or more build-args [bar] were not consumed")) + o.Expect(buildLog).To(o.Or(o.ContainSubstring("One or more build-args [bar] were not consumed"), o.ContainSubstring("one or more build args were not consumed: [bar]"))) }) })