mirror of
https://github.com/containers/podman.git
synced 2025-12-12 17:57:31 +08:00
Switch all rootful to rootfull
We are inconsistent on the name, we should stick with rootfull. [NO NEW TESTS NEEDED] Existing tests should handle this and no tests for machines exists yet. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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...))
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user