mirror of
https://github.com/containers/podman.git
synced 2025-09-10 08:22:23 +08:00

e2e test failures are rife with messages like: Expected 1 to equal 0 These make me cry. They're anti-helpful, requiring the reader to dive into the source code to figure out what those numbers mean. Solution: Go tests have a '.Should(Exit(NNN))' mechanism. I don't know if it spits out a better diagnostic (I have no way to run e2e tests on my laptop), but I have to fantasize that it will, and given the state of our flakes I assume that at least one test will fail and give me the opportunity to see what the error message looks like. THIS IS NOT REVIEWABLE CODE. There is no way for a human to review it. Don't bother. Maybe look at a few random ones for sanity. If you want to really review, here is a reproducer of what I did: cd test/e2e ! positive assertions. The second is the same as the first, ! with the addition of (unnecessary) parentheses because ! some invocations were written that way. The third is BeZero(). perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.To\(Equal\((\d+)\)\)/Expect($1).Should(Exit($2))/' *_test.go perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.To\(\(Equal\((\d+)\)\)\)/Expect($1).Should(Exit($2))/' *_test.go perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.To\(BeZero\(\)\)/Expect($1).Should(Exit(0))/' *_test.go ! Same as above, but handles three non-numeric exit codes ! in run_exit_test.go perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.To\(Equal\((\S+)\)\)/Expect($1).Should(Exit($2))/' *_test.go ! negative assertions. Difference is the spelling of 'To(Not)', ! 'ToNot', and 'NotTo'. I assume those are all the same. perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.To\(Not\(Equal\((0)\)\)\)/Expect($1).To(ExitWithError())/' *_test.go perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.ToNot\(Equal\((0)\)\)/Expect($1).To(ExitWithError())/' *_test.go perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.NotTo\(Equal\((0)\)\)/Expect($1).To(ExitWithError())/' *_test.go ! negative, old use of BeZero() perl -pi -e 's/Expect\((\S+)\.ExitCode\(\)\)\.ToNot\(BeZero\(\)\)/Expect($1).Should(ExitWithError())/' *_test.go Run those on a clean copy of main branch (at the same branch point as my PR, of course), then diff against a checked-out copy of my PR. There should be no differences. Then all you have to review is that my replacements above are sane. UPDATE: nope, that's not enough, you also need to add gomega/gexec to the files that don't have it: perl -pi -e '$_ .= "$1/gexec\"\n" if m!^(.*/onsi/gomega)"!' $(grep -L gomega/gexec $(git log -1 --stat | awk '$1 ~ /test\/e2e\// { print $1}')) UPDATE 2: hand-edit run_volume_test.go UPDATE 3: sigh, add WaitWithDefaultTimeout() to a couple of places UPDATE 4: skip a test due to bug #10935 (race condition) Signed-off-by: Ed Santiago <santiago@redhat.com>
142 lines
3.7 KiB
Go
142 lines
3.7 KiB
Go
package integration
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/containers/podman/v3/pkg/rootless"
|
|
. "github.com/containers/podman/v3/test/utils"
|
|
. "github.com/onsi/ginkgo"
|
|
. "github.com/onsi/gomega"
|
|
. "github.com/onsi/gomega/gexec"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
const sigCatch = "trap \"echo FOO >> /h/fifo \" 8; echo READY >> /h/fifo; while :; do sleep 0.25; done"
|
|
const sigCatch2 = "trap \"echo Received\" SIGFPE; while :; do sleep 0.25; done"
|
|
|
|
var _ = Describe("Podman run with --sig-proxy", func() {
|
|
var (
|
|
tmpdir string
|
|
err error
|
|
podmanTest *PodmanTestIntegration
|
|
)
|
|
|
|
BeforeEach(func() {
|
|
tmpdir, err = CreateTempDirInTempDir()
|
|
if err != nil {
|
|
os.Exit(1)
|
|
}
|
|
podmanTest = PodmanTestCreate(tmpdir)
|
|
podmanTest.Setup()
|
|
podmanTest.SeedImages()
|
|
})
|
|
|
|
AfterEach(func() {
|
|
podmanTest.Cleanup()
|
|
f := CurrentGinkgoTestDescription()
|
|
processTestResult(f)
|
|
|
|
})
|
|
|
|
Specify("signals are forwarded to container using sig-proxy", func() {
|
|
SkipIfRemote("FIXME: This looks like it is supposed to work in remote")
|
|
if podmanTest.Host.Arch == "ppc64le" {
|
|
Skip("Doesn't work on ppc64le")
|
|
}
|
|
signal := syscall.SIGFPE
|
|
// Set up a socket for communication
|
|
udsDir := filepath.Join(tmpdir, "socket")
|
|
os.Mkdir(udsDir, 0700)
|
|
udsPath := filepath.Join(udsDir, "fifo")
|
|
syscall.Mkfifo(udsPath, 0600)
|
|
if rootless.IsRootless() {
|
|
podmanTest.RestoreArtifact(fedoraMinimal)
|
|
}
|
|
_, pid := podmanTest.PodmanPID([]string{"run", "-it", "-v", fmt.Sprintf("%s:/h:Z", udsDir), fedoraMinimal, "bash", "-c", sigCatch})
|
|
|
|
uds, _ := os.OpenFile(udsPath, os.O_RDONLY|syscall.O_NONBLOCK, 0600)
|
|
defer uds.Close()
|
|
|
|
// Wait for the script in the container to alert us that it is READY
|
|
counter := 0
|
|
for {
|
|
buf := make([]byte, 1024)
|
|
n, err := uds.Read(buf[:])
|
|
if err != nil && err != io.EOF {
|
|
fmt.Println(err)
|
|
return
|
|
}
|
|
data := string(buf[0:n])
|
|
if strings.Contains(data, "READY") {
|
|
break
|
|
}
|
|
time.Sleep(1 * time.Second)
|
|
if counter == 15 {
|
|
Fail("Timed out waiting for READY from container")
|
|
}
|
|
counter++
|
|
}
|
|
// Ok, container is up and running now and so is the script
|
|
|
|
if err := unix.Kill(pid, signal); err != nil {
|
|
Fail(fmt.Sprintf("error killing podman process %d: %v", pid, err))
|
|
}
|
|
|
|
// The sending of the signal above will send FOO to the socket; here we
|
|
// listen to the socket for that.
|
|
counter = 0
|
|
for {
|
|
buf := make([]byte, 1024)
|
|
n, err := uds.Read(buf[:])
|
|
if err != nil {
|
|
fmt.Println(err)
|
|
return
|
|
}
|
|
data := string(buf[0:n])
|
|
if strings.Contains(data, "FOO") {
|
|
break
|
|
}
|
|
time.Sleep(1 * time.Second)
|
|
if counter == 15 {
|
|
Fail("timed out waiting for FOO from container")
|
|
}
|
|
counter++
|
|
}
|
|
})
|
|
|
|
Specify("signals are not forwarded to container with sig-proxy false", func() {
|
|
SkipIfRemote("FIXME: This looks like it is supposed to work in remote")
|
|
signal := syscall.SIGFPE
|
|
if rootless.IsRootless() {
|
|
podmanTest.RestoreArtifact(fedoraMinimal)
|
|
}
|
|
session, pid := podmanTest.PodmanPID([]string{"run", "--name", "test2", "--sig-proxy=false", fedoraMinimal, "bash", "-c", sigCatch2})
|
|
|
|
ok := WaitForContainer(podmanTest)
|
|
Expect(ok).To(BeTrue())
|
|
|
|
// Kill with given signal
|
|
// Should be no output, SIGPOLL is usually ignored
|
|
if err := unix.Kill(pid, signal); err != nil {
|
|
Fail(fmt.Sprintf("error killing podman process %d: %v", pid, err))
|
|
}
|
|
|
|
// Kill with -9 to guarantee the container dies
|
|
killSession := podmanTest.Podman([]string{"kill", "-s", "9", "test2"})
|
|
killSession.WaitWithDefaultTimeout()
|
|
Expect(killSession).Should(Exit(0))
|
|
|
|
session.WaitWithDefaultTimeout()
|
|
Expect(session).To(ExitWithError())
|
|
ok, _ = session.GrepString("Received")
|
|
Expect(ok).To(BeFalse())
|
|
})
|
|
|
|
})
|