Skip to content

Commit

Permalink
e2e tests: reenable long-skipped build test
Browse files Browse the repository at this point in the history
July 2022: test was flaking on new VM images. We needed new
images, so I filed containers#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 containers#13655)... but containers#16810 changed that
so Containerfile no longer appears. @flouthoc argues that
this too is deliberate (containers#17059). Okay, so let's change the
test then. All I care about is not adding more regressions.

Signed-off-by: Ed Santiago <[email protected]>
  • Loading branch information
edsantiago committed Jan 19, 2023
1 parent 21d1e79 commit 51836aa
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions test/e2e/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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())
Expand All @@ -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"))
})
Expand Down

0 comments on commit 51836aa

Please sign in to comment.