summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/e2e/common_test.go2
-rw-r--r--test/e2e/import_test.go2
-rw-r--r--test/e2e/run_entrypoint_test.go2
-rw-r--r--test/e2e/run_networking_test.go8
-rw-r--r--test/e2e/run_test.go2
-rw-r--r--test/e2e/run_volume_test.go12
-rw-r--r--test/e2e/system_service_test.go6
-rw-r--r--test/system/035-logs.bats4
-rw-r--r--test/system/600-completion.bats2
9 files changed, 27 insertions, 13 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index a411a860b..6e1a62b99 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -15,8 +15,8 @@ import (
"testing"
"time"
+ "github.com/containers/common/pkg/cgroups"
"github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/cgroups"
"github.com/containers/podman/v3/pkg/inspect"
"github.com/containers/podman/v3/pkg/rootless"
. "github.com/containers/podman/v3/test/utils"
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go
index e1c89753e..87aa7d438 100644
--- a/test/e2e/import_test.go
+++ b/test/e2e/import_test.go
@@ -155,7 +155,7 @@ var _ = Describe("Podman import", func() {
})
It("podman import with signature", func() {
- SkipIfRemote("FIXME: remote ignores --signature-policy, #12357")
+ SkipIfRemote("--signature-policy N/A for remote")
outfile := filepath.Join(podmanTest.TempDir, "container.tar")
_, ec, cid := podmanTest.RunLsContainer("")
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index 23c343332..e91e75adf 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -103,7 +103,7 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
})
It("podman run user entrypoint overrides image entrypoint and image cmd", func() {
- SkipIfRemote("FIXME: podman-remote not handling passing --entrypoint=\"\" flag correctly")
+ SkipIfRemote("#12521: podman-remote not handling passing empty --entrypoint")
dockerfile := `FROM quay.io/libpod/alpine:latest
CMD ["-i"]
ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 00db9b727..42fdefabf 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -514,9 +514,9 @@ EXPOSE 2004-2005/tcp`, ALPINE)
})
It("podman run network expose duplicate host port results in error", func() {
- SkipIfRootless("FIXME we should be able to run this test in rootless mode with different ports")
+ port := "8190" // Make sure this isn't used anywhere else
- session := podmanTest.Podman([]string{"run", "--name", "test", "-dt", "-p", "80", ALPINE, "/bin/sh"})
+ session := podmanTest.Podman([]string{"run", "--name", "test", "-dt", "-p", port, ALPINE, "/bin/sh"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@@ -526,8 +526,8 @@ EXPOSE 2004-2005/tcp`, ALPINE)
containerConfig := inspect.InspectContainerToJSON()
Expect(containerConfig[0].NetworkSettings.Ports).To(Not(BeNil()))
- Expect(containerConfig[0].NetworkSettings.Ports).To(HaveKeyWithValue("80/tcp", Not(BeNil())))
- Expect(containerConfig[0].NetworkSettings.Ports["80/tcp"][0].HostPort).ToNot(Equal(80))
+ Expect(containerConfig[0].NetworkSettings.Ports).To(HaveKeyWithValue(port+"/tcp", Not(BeNil())))
+ Expect(containerConfig[0].NetworkSettings.Ports[port+"/tcp"][0].HostPort).ToNot(Equal(port))
})
It("podman run forward sctp protocol", func() {
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index f063c79e9..8db23080e 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -12,7 +12,7 @@ import (
"syscall"
"time"
- "github.com/containers/podman/v3/pkg/cgroups"
+ "github.com/containers/common/pkg/cgroups"
"github.com/containers/podman/v3/pkg/rootless"
. "github.com/containers/podman/v3/test/utils"
"github.com/containers/storage/pkg/stringid"
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 3d05e0f70..c2817c551 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -762,6 +762,18 @@ USER testuser`, fedoraMinimal)
})
+ It("podman run with named volume check if we honor permission of target dir", func() {
+ session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "stat", "-c", "%a %Y", "/var/tmp"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ perms := session.OutputToString()
+
+ session = podmanTest.Podman([]string{"run", "--rm", "-v", "test:/var/tmp", ALPINE, "stat", "-c", "%a %Y", "/var/tmp"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ Expect(session.OutputToString()).To(Equal(perms))
+ })
+
It("podman volume with uid and gid works", func() {
volName := "testVol"
volCreate := podmanTest.Podman([]string{"volume", "create", "--opt", "o=uid=1000", volName})
diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go
index 9a4d687c3..922a8c423 100644
--- a/test/e2e/system_service_test.go
+++ b/test/e2e/system_service_test.go
@@ -45,8 +45,6 @@ var _ = Describe("podman system service", func() {
defer session.Kill()
WaitForService(address)
-
- session.Wait(5 * time.Second)
Eventually(session, 5).Should(Exit(0))
})
})
@@ -91,7 +89,7 @@ var _ = Describe("podman system service", func() {
Expect(body).ShouldNot(BeEmpty())
session.Interrupt().Wait(2 * time.Second)
- Eventually(session).Should(Exit(1))
+ Eventually(session, 5).Should(Exit(1))
})
It("are not available", func() {
@@ -113,7 +111,7 @@ var _ = Describe("podman system service", func() {
Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment))
session.Interrupt().Wait(2 * time.Second)
- Eventually(session).Should(Exit(1))
+ Eventually(session, 5).Should(Exit(1))
})
})
})
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index 44984eaad..3caf97a22 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -91,6 +91,10 @@ ${cid[0]} d" "Sequential output from logs"
function _log_test_restarted() {
run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log'
+ # FIXME: #9597
+ # run/start is flaking for remote so let's wait for the container condition
+ # to stop wasting energy until the root cause gets fixed.
+ run_podman container wait --condition=exited logtest
run_podman start -a logtest
logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX)
$PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile
diff --git a/test/system/600-completion.bats b/test/system/600-completion.bats
index f580fc2fe..9fdd42332 100644
--- a/test/system/600-completion.bats
+++ b/test/system/600-completion.bats
@@ -309,7 +309,7 @@ function _check_completion_end() {
# Clean up the pod pause image
run_podman image list --format '{{.ID}} {{.Repository}}'
while read id name; do
- if [[ "$name" =~ /pause ]]; then
+ if [[ "$name" =~ /podman-pause ]]; then
run_podman rmi $id
fi
done <<<"$output"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-21 14:05:52 +0000