From 51836aa47ce224f0f3bdbee2152c74665a4a0634 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 18 Jan 2023 17:31:03 -0700 Subject: [PATCH] e2e tests: reenable long-skipped build test July 2022: test was flaking on new VM images. We needed new images, so I filed #15014 and skipped the test. January 2023: no attention from anyone, so I'll try bumping up a dd timeout from 10s to 30s. But in the interim, the test has broken: it used to expect "Containerfile" in output (this was deliberately added in #13655)... but #16810 changed that so Containerfile no longer appears. @flouthoc argues that this too is deliberate (#17059). Okay, so let's change the test then. All I care about is not adding more regressions. Signed-off-by: Ed Santiago --- test/e2e/build_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index fb75ad1b94..22e5d419d0 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -572,8 +572,6 @@ subdir**` // See https://github.com/containers/podman/issues/13535 It("Remote build .containerignore filtering embedded directory (#13535)", func() { SkipIfNotRemote("Testing remote .containerignore file filtering") - Skip("FIXME: #15014: test times out in 'dd' on f36.") - podmanTest.RestartRemoteService() // Switch to temp dir and restore it afterwards @@ -605,7 +603,7 @@ subdir**` dd := exec.Command("dd", "if=/dev/urandom", "of="+randomFile, "bs=1G", "count=1") ddSession, err := Start(dd, GinkgoWriter, GinkgoWriter) Expect(err).ToNot(HaveOccurred()) - Eventually(ddSession, "10s", "1s").Should(Exit(0)) + Eventually(ddSession, "30s", "1s").Should(Exit(0)) // make cwd as context root path Expect(os.Chdir(contextDir)).ToNot(HaveOccurred()) @@ -623,7 +621,7 @@ subdir**` Expect(session).To(Exit(0)) output := session.OutputToString() - Expect(output).To(ContainSubstring("Containerfile")) + Expect(output).NotTo(ContainSubstring("Containerfile")) Expect(output).To(ContainSubstring("/testfilter/expected")) Expect(output).NotTo(ContainSubstring("subdir")) })