diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-25 13:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 13:37:59 -0400 |
| commit | a775e77cba3be5ec77738787f4346ff7e1d24462 (patch) | |
| tree | f50573eb3d9c42aa89a93b0a15298a0909fb38fe /test/system | |
| parent | 9784d97bd6cef590de781575992f7a685ab1c2c2 (diff) | |
| parent | a615cb2fe22dbfb3ec0acc0e60d8f849301c3aac (diff) | |
| download | podman-a775e77cba3be5ec77738787f4346ff7e1d24462.tar.gz podman-a775e77cba3be5ec77738787f4346ff7e1d24462.tar.bz2 podman-a775e77cba3be5ec77738787f4346ff7e1d24462.zip | |
Merge pull request #13995 from ashley-cui/revrootful
Rootfull -> Rootful
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/270-socket-activation.bats | 2 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 2 | ||||
| -rw-r--r-- | test/system/helpers.bash | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/system/270-socket-activation.bats b/test/system/270-socket-activation.bats index 19f68abdd..6d582be18 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 rootfull" + skip "there is no pause process when running rootful" fi run_podman run -d $IMAGE sleep 90 cid="$output" diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 958aa4493..01571d176 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -83,7 +83,7 @@ load helpers } # Issue #5466 - port-forwarding doesn't work with this option and -d -@test "podman networking: port with --userns=keep-id for rootless or --uidmap=* for rootfull" { +@test "podman networking: port with --userns=keep-id for rootless or --uidmap=* for rootful" { for cidr in "" "$(random_rfc1918_subnet).0/24"; do myport=$(random_free_port 52000-52999) if [[ -z $cidr ]]; then diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 1a1dc0df9..138d668f4 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -423,7 +423,7 @@ function skip_if_rootless() { ###################### function skip_if_not_rootless() { if ! is_rootless; then - local msg=$(_add_label_if_missing "$1" "rootfull") + local msg=$(_add_label_if_missing "$1" "rootful") skip "${msg:-not applicable under rootlfull podman}" fi } @@ -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 rootfull ubuntu, usually due to user errors" + skip "Cannot run this test on rootful ubuntu, usually due to user errors" fi fi fi |