diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-22 06:56:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 06:56:33 -0400 |
| commit | 0d6af1438710acc03ef9e7395e1bc8ecf46f4294 (patch) | |
| tree | 14341c3d033e132c426c14cd2cf2f5618d4ec044 /test | |
| parent | 1fcefc94f9e3e6d9dedeccc83fa3964461519b7f (diff) | |
| parent | cc3790f332d989440eb1720e24e3619fc97c74ee (diff) | |
| download | podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.gz podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.bz2 podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.zip | |
Merge pull request #13964 from rhatdan/rootfull
Switch all rootful to rootfull
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/exec_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/mount_rootless_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/network_test.go | 2 | ||||
| -rw-r--r-- | test/system/270-socket-activation.bats | 2 | ||||
| -rw-r--r-- | test/system/helpers.bash | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 3987746d0..4cfaa9a2e 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -123,7 +123,7 @@ var _ = Describe("Podman exec", func() { }) It("podman exec in keep-id container drops privileges", func() { - SkipIfNotRootless("This function is not enabled for rootful podman") + SkipIfNotRootless("This function is not enabled for rootfull podman") ctrName := "testctr1" testCtr := podmanTest.Podman([]string{"run", "-d", "--name", ctrName, "--userns=keep-id", ALPINE, "top"}) testCtr.WaitWithDefaultTimeout() diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index 30d7ce8a9..830c2dcda 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -17,7 +17,7 @@ var _ = Describe("Podman mount", func() { ) BeforeEach(func() { - SkipIfNotRootless("This function is not enabled for rootful podman") + SkipIfNotRootless("This function is not enabled for rootfull podman") SkipIfRemote("Podman mount not supported for remote connections") tempdir, err = CreateTempDirInTempDir() if err != nil { diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 89a9005f5..a7981a4d8 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -254,7 +254,7 @@ var _ = Describe("Podman network", func() { expectedNetworks := []string{name} if !rootless.IsRootless() { - // rootful image contains "podman/cni/87-podman-bridge.conflist" for "podman" network + // rootfull image contains "podman/cni/87-podman-bridge.conflist" for "podman" network expectedNetworks = append(expectedNetworks, "podman") } session := podmanTest.Podman(append([]string{"network", "inspect"}, expectedNetworks...)) diff --git a/test/system/270-socket-activation.bats b/test/system/270-socket-activation.bats index 6d582be18..19f68abdd 100644 --- a/test/system/270-socket-activation.bats +++ b/test/system/270-socket-activation.bats @@ -90,7 +90,7 @@ function teardown() { @test "podman system service - socket activation - kill rootless pause" { if ! is_rootless; then - skip "there is no pause process when running rootful" + skip "there is no pause process when running rootfull" fi run_podman run -d $IMAGE sleep 90 cid="$output" diff --git a/test/system/helpers.bash b/test/system/helpers.bash index b41be53bc..1a1dc0df9 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -483,7 +483,7 @@ function skip_if_root_ubuntu { if is_ubuntu; then if ! is_remote; then if ! is_rootless; then - skip "Cannot run this test on rootful ubuntu, usually due to user errors" + skip "Cannot run this test on rootfull ubuntu, usually due to user errors" fi fi fi |