Merge pull request containers#12764 from edsantiago/bats

Emergency system-test fixes
Luap99 · Jan 7, 2022 · 7dd7b98 · 7dd7b98
2 parents 67dab9e + f688908
commit 7dd7b98
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git 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
@@ -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
 }