From f6889081519921518b31c90b5fbf9354d27b7b83 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Thu, 6 Jan 2022 15:54:01 -0700
Subject: Emergency system-test fixes
Emergency fix to image-scp tests. DO NOT CREATE A USER!
These tests are run in all sorts of environments. We
do not have the right to vandalize a production system.
Also remove some misleading unneeded tests; and refactor a
little; and add a bunch of FIXMEs which will need to be
addressed later.
Also, super-low priority, add 'crun: ' to expected error
message in a run test (minor followup to #12758).
Signed-off-by: Ed Santiago <santiago@redhat.com>
---
test/system/030-run.bats | 4 ++--
test/system/120-load.bats | 43 +++++++++++++++++++------------------------
2 files changed, 21 insertions(+), 26 deletions(-)
(limited to 'test')
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 317026710..feca5370b 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -14,8 +14,8 @@ load helpers
# ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/crun"; then
- err_no_such_cmd="Error:.*executable file.* not found in \$PATH: No such file or directory: OCI runtime attempted to invoke a command that was not found"
- err_no_exec_dir="Error:.*open executable: Operation not permitted: OCI permission denied"
+ err_no_such_cmd="Error: crun: executable file.* not found in \$PATH: No such file or directory: OCI runtime attempted to invoke a command that was not found"
+ err_no_exec_dir="Error: crun: open executable: Operation not permitted: OCI permission denied"
fi
tests="
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index 541095764..b1d181d50 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -79,31 +79,26 @@ verify_iid_and_name() {
}
@test "podman image scp transfer" {
- skip_if_root_ubuntu "cannot create a new user successfully on ubuntu"
+ skip_if_remote "only applicable under local podman"
+
+ skip "FIXME FIXME FIXME: this needs a big rewrite"
+
get_iid_and_name
- if ! is_remote; then
- if is_rootless; then
- whoami=$(id -un)
- run_podman image scp $whoami@localhost::$iid root@localhost::
- if [ "$status" -ne 0 ]; then
- die "Command failed: podman image scp transfer"
- fi
- whoami=$(id -un)
- run_podman image scp -q $whoami@localhost::$iid root@localhost::
- if [ "$status" -ne 0 ]; then
- die "Command failed: podman image scp quiet transfer failed"
- fi
- fi
- if ! is_rootless; then
- id -u 1000 &>/dev/null || useradd -u 1000 -g 1000 testingUsr
- if [ "$status" -ne 0 ]; then
- die "Command failed: useradd 1000"
- fi
- run_podman image scp root@localhost::$iid 1000:1000@localhost::
- if [ "$status" -ne 0 ]; then
- die "Command failed: podman image scp transfer"
- fi
- fi
+ if is_rootless; then
+ whoami=$(id -un)
+ # FIXME: first, test that we can sudo. If we can't, skip.
+ # FIXME: test 'scp $IMAGE root@localhost::'
+ # FIXME: then test the rest
+ # FIXME: check output
+ run_podman image scp $whoami@localhost::$iid root@localhost::
+ is "$output" "Loaded image.*: $iid" "...."
+
+ # FIXME: "-q" is a NOP
+ run_podman image scp -q $whoami@localhost::$iid root@localhost::
+ else
+ # root
+ # FIXME: identify a rootless user. DO NOT CREATE ONE.
+ run_podman image scp root@localhost::$iid 1000:1000@localhost::
fi
}
--
cgit v1.2.3-54-g00ecf