mirror of https://github.com/containers/podman.git
Get E2E tests to pass
Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
parent
97499a70aa
commit
89d0ccd195
|
|
@ -736,8 +736,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Errorf("PAST INUSE")
|
|
||||||
|
|
||||||
// Check that the container's in a good state to be removed.
|
// Check that the container's in a good state to be removed.
|
||||||
if c.ensureState(define.ContainerStateRunning, define.ContainerStateStopping) {
|
if c.ensureState(define.ContainerStateRunning, define.ContainerStateStopping) {
|
||||||
time := c.StopTimeout()
|
time := c.StopTimeout()
|
||||||
|
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
package integration
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
. "github.com/containers/podman/v4/test/utils"
|
|
||||||
. "github.com/onsi/ginkgo"
|
|
||||||
. "github.com/onsi/gomega"
|
|
||||||
. "github.com/onsi/gomega/gexec"
|
|
||||||
)
|
|
||||||
|
|
||||||
var _ = Describe("Podman namespaces", func() {
|
|
||||||
var (
|
|
||||||
tempdir string
|
|
||||||
err error
|
|
||||||
podmanTest *PodmanTestIntegration
|
|
||||||
)
|
|
||||||
|
|
||||||
BeforeEach(func() {
|
|
||||||
tempdir, err = CreateTempDirInTempDir()
|
|
||||||
if err != nil {
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
podmanTest = PodmanTestCreate(tempdir)
|
|
||||||
podmanTest.Setup()
|
|
||||||
})
|
|
||||||
|
|
||||||
AfterEach(func() {
|
|
||||||
podmanTest.Cleanup()
|
|
||||||
f := CurrentGinkgoTestDescription()
|
|
||||||
processTestResult(f)
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
It("podman namespace test", func() {
|
|
||||||
podman1 := podmanTest.Podman([]string{"--namespace", "test1", "run", "-d", ALPINE, "echo", "hello"})
|
|
||||||
podman1.WaitWithDefaultTimeout()
|
|
||||||
if IsRemote() {
|
|
||||||
// --namespace flag not supported in podman remote
|
|
||||||
Expect(podman1).Should(Exit(125))
|
|
||||||
Expect(podman1.ErrorToString()).To(ContainSubstring("unknown flag: --namespace"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
Expect(podman1).Should(Exit(0))
|
|
||||||
|
|
||||||
podman2 := podmanTest.Podman([]string{"--namespace", "test2", "ps", "-aq"})
|
|
||||||
podman2.WaitWithDefaultTimeout()
|
|
||||||
Expect(podman2).Should(Exit(0))
|
|
||||||
output := podman2.OutputToStringArray()
|
|
||||||
numCtrs := 0
|
|
||||||
for _, outputLine := range output {
|
|
||||||
if outputLine != "" {
|
|
||||||
numCtrs++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Expect(numCtrs).To(Equal(0))
|
|
||||||
|
|
||||||
numberOfCtrsNoNamespace := podmanTest.NumberOfContainers()
|
|
||||||
Expect(numberOfCtrsNoNamespace).To(Equal(1))
|
|
||||||
})
|
|
||||||
})
|
|
||||||
Loading…
Reference in New Issue