opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2e tests: reenable long-skipped build test

Browse Source 
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 <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-01-18 17:31:03 -07:00
parent 21d1e794ce
commit 51836aa47c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/build_test.go
View File

@ -572,8 +572,6 @@ subdir**`
// See https://github.com/containers/podman/issues/13535 // See https://github.com/containers/podman/issues/13535
It("Remote build .containerignore filtering embedded directory (#13535)", func() { It("Remote build .containerignore filtering embedded directory (#13535)", func() {
SkipIfNotRemote("Testing remote .containerignore file filtering") SkipIfNotRemote("Testing remote .containerignore file filtering")
Skip("FIXME: #15014: test times out in 'dd' on f36.")
podmanTest.RestartRemoteService() podmanTest.RestartRemoteService()
// Switch to temp dir and restore it afterwards // 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") dd := exec.Command("dd", "if=/dev/urandom", "of="+randomFile, "bs=1G", "count=1")
ddSession, err := Start(dd, GinkgoWriter, GinkgoWriter) ddSession, err := Start(dd, GinkgoWriter, GinkgoWriter)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Eventually(ddSession, "10s", "1s").Should(Exit(0)) Eventually(ddSession, "30s", "1s").Should(Exit(0))
// make cwd as context root path // make cwd as context root path
Expect(os.Chdir(contextDir)).ToNot(HaveOccurred()) Expect(os.Chdir(contextDir)).ToNot(HaveOccurred())
@ -623,7 +621,7 @@ subdir**`
Expect(session).To(Exit(0)) Expect(session).To(Exit(0))
output := session.OutputToString() output := session.OutputToString()
Expect(output).To(ContainSubstring("Containerfile")) Expect(output).NotTo(ContainSubstring("Containerfile"))
Expect(output).To(ContainSubstring("/testfilter/expected")) Expect(output).To(ContainSubstring("/testfilter/expected"))
Expect(output).NotTo(ContainSubstring("subdir")) Expect(output).NotTo(ContainSubstring("subdir"))
}) })