9 files changed, 109 insertions, 18 deletions
diff --git a/test/system/020-tag.bats b/test/system/020-tag.bats
index 7593ad68f..1f5eede39 100644
--- a/test/system/020-tag.bats
+++ b/test/system/020-tag.bats
@@ -32,4 +32,23 @@ function _tag_and_check() {
 	is "$output" "Error: \"registry.com/foo:bar\": no such tag"
 }
 
+@test "podman untag all" {
+	# First get the image ID
+	run_podman inspect --format '{{.ID}}' $IMAGE
+	iid=$output
+
+	# Add a couple of tags
+	run_podman tag $IMAGE registry.com/1:latest registry.com/2:latest registry.com/3:latest
+
+	# Untag with arguments to for all tags to be removed
+	run_podman untag $iid
+
+	# Now make sure all tags are removed
+	run_podman image inspect $iid --format "{{.RepoTags}}"
+	is "$output" "\[\]" "untag by ID leaves empty set of tags"
+
+	# Restore image
+	run_podman tag $iid $IMAGE
+}
+
 # vim: filetype=sh
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 11edaf11c..766948ecc 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -14,7 +14,7 @@ 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 command not found error"
+        err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error"
         err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error"
     fi
 
@@ -132,8 +132,6 @@ echo $rand        |   0 | $rand
 }
 
 @test "podman run --pull" {
-    skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"
-
     run_podman run --pull=missing $IMAGE true
     is "$output" "" "--pull=missing [present]: no output"
 
@@ -155,8 +153,23 @@ echo $rand        |   0 | $rand
     run_podman run --pull=always $NONLOCAL_IMAGE true
     is "$output" "Trying to pull .*" "--pull=always [with image PRESENT]: re-fetches"
 
+    # Very weird corner case fixed by #7770: 'podman run foo' will run 'myfoo'
+    # if it exists, because the string 'foo' appears in 'myfoo'. This test
+    # covers that, as well as making sure that our testimage (which is always
+    # tagged :YYYYMMDD, never :latest) doesn't match either.
+    run_podman tag $IMAGE my${PODMAN_TEST_IMAGE_NAME}:latest
+    run_podman 125 run --pull=never $PODMAN_TEST_IMAGE_NAME true
+    is "$output" "Error: unable to find a name and tag match for $PODMAN_TEST_IMAGE_NAME in repotags: no such image" \
+       "podman run --pull=never with shortname (and implicit :latest)"
+
+    # ...but if we add a :latest tag (without 'my'), it should now work
+    run_podman tag $IMAGE ${PODMAN_TEST_IMAGE_NAME}:latest
+    run_podman run --pull=never ${PODMAN_TEST_IMAGE_NAME} cat /home/podman/testimage-id
+    is "$output" "$PODMAN_TEST_IMAGE_TAG" \
+       "podman run --pull=never, with shortname, succeeds if img is present"
+
     run_podman rm -a
-    run_podman rmi $NONLOCAL_IMAGE
+    run_podman rmi $NONLOCAL_IMAGE {my,}${PODMAN_TEST_IMAGE_NAME}:latest
 }
 
 # 'run --rmi' deletes the image in the end unless it's used by another container
@@ -267,8 +280,6 @@ echo $rand        |   0 | $rand
 # symptom only manifests on a fedora container image -- we have no
 # reproducer on alpine. Checking directory ownership is good enough.
 @test "podman run : user namespace preserved root ownership" {
-    skip_if_remote "FIXME: pending #7195"
-
     for priv in "" "--privileged"; do
         for user in "--user=0" "--user=100"; do
             for keepid in "" "--userns=keep-id"; do
@@ -286,8 +297,6 @@ echo $rand        |   0 | $rand
 
 # #6829 : add username to /etc/passwd inside container if --userns=keep-id
 @test "podman run : add username to /etc/passwd if --userns=keep-id" {
-    skip_if_remote "FIXME: pending #7195"
-
     # Default: always run as root
     run_podman run --rm $IMAGE id -un
     is "$output" "root" "id -un on regular container"
@@ -310,9 +319,7 @@ echo $rand        |   0 | $rand
 
 # #6991 : /etc/passwd is modifiable
 @test "podman run : --userns=keep-id: passwd file is modifiable" {
-    skip_if_remote "FIXME: pending #7195"
-
-    run_podman run -d --userns=keep-id $IMAGE sh -c 'while ! test -e /stop; do sleep 0.1; done'
+    run_podman run -d --userns=keep-id --cap-add=dac_override $IMAGE sh -c 'while ! test -e /tmp/stop; do sleep 0.1; done'
     cid="$output"
 
     # Assign a UID that is (a) not in our image /etc/passwd and (b) not
@@ -333,7 +340,7 @@ echo $rand        |   0 | $rand
     is "$output" "newuser3:x:$uid:999:$gecos:/home/newuser3:/bin/sh" \
        "newuser3 added to /etc/passwd in container"
 
-    run_podman exec $cid touch /stop
+    run_podman exec $cid touch /tmp/stop
     run_podman wait $cid
 }
 
@@ -387,5 +394,42 @@ json-file | f
        "--log-driver InvalidDriver"
 }
 
+@test "podman run --log-driver journald" {
+    skip_if_remote "We cannot read journalctl over remote."
+
+    msg=$(random_string 20)
+    pidfile="${PODMAN_TMPDIR}/$(random_string 20)"
+
+    run_podman run --name myctr --log-driver journald --conmon-pidfile $pidfile $IMAGE echo $msg
+
+    journalctl --output cat  _PID=$(cat $pidfile)
+    is "$output" "$msg" "check that journalctl output equals the container output"
+
+    run_podman rm myctr
+}
+
+@test "podman run --tz" {
+    # This file will always have a constant reference timestamp
+    local testfile=/home/podman/testimage-id
+
+    run_podman run --rm $IMAGE date -r $testfile
+    is "$output" "Sun Sep 13 12:26:40 UTC 2020" "podman run with no TZ"
+
+    run_podman run --rm --tz=MST7MDT $IMAGE date -r $testfile
+    is "$output" "Sun Sep 13 06:26:40 MDT 2020" "podman run with --tz=MST7MDT"
+
+    # --tz=local pays attention to /etc/localtime, not $TZ. We set TZ anyway,
+    # to make sure podman ignores it; and, because this test is locale-
+    # dependent, we pick an obscure zone (+1245) that is unlikely to
+    # collide with any of our testing environments.
+    #
+    # To get a reference timestamp we run 'date' locally; note the explicit
+    # strftime() format. We can't use --iso=seconds because GNU date adds
+    # a colon to the TZ offset (eg -07:00) whereas alpine does not (-0700).
+    run date --date=@1600000000 +%Y-%m-%dT%H:%M:%S%z
+    expect="$output"
+    TZ=Pacific/Chatham run_podman run --rm --tz=local $IMAGE date -Iseconds -r $testfile
+    is "$output" "$expect" "podman run with --tz=local, matches host"
+}
 
 # vim: filetype=sh
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index e3a139b4f..1329c6168 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -268,6 +268,14 @@ Labels.$label_name | $label_value
     is "${lines[-1]}" "...  ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
        "image tree: last layer line"
 
+    # FIXME: 'image tree --whatrequires' does not work via remote
+    if ! is_remote; then
+        run_podman image tree --whatrequires $IMAGE
+        is "${lines[-1]}" \
+           ".*ID: .* Top Layer of: \\[localhost/build_test:latest\\]" \
+           "'image tree --whatrequires' shows our built image"
+    fi
+
     # Clean up
     run_podman rmi -f build_test
 }
diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats
index e9db8c27e..edd7dedc4 100644
--- a/test/system/075-exec.bats
+++ b/test/system/075-exec.bats
@@ -92,14 +92,14 @@ load helpers
 # #6829 : add username to /etc/passwd inside container if --userns=keep-id
 @test "podman exec - with keep-id" {
     run_podman run -d --userns=keep-id $IMAGE sh -c \
-               "echo READY;while [ ! -f /stop ]; do sleep 1; done"
+               "echo READY;while [ ! -f /tmp/stop ]; do sleep 1; done"
     cid="$output"
     wait_for_ready $cid
 
     run_podman exec $cid id -un
     is "$output" "$(id -un)" "container is running as current user"
 
-    run_podman exec --user=$(id -un) $cid touch /stop
+    run_podman exec --user=$(id -un) $cid touch /tmp/stop
     run_podman wait $cid
     run_podman rm $cid
 }
diff --git a/test/system/080-pause.bats b/test/system/080-pause.bats
index 4ec0906f4..ea4c85f8f 100644
--- a/test/system/080-pause.bats
+++ b/test/system/080-pause.bats
@@ -6,7 +6,9 @@
 load helpers
 
 @test "podman pause/unpause" {
-    skip_if_rootless "pause does not work rootless"
+    if is_rootless && ! is_cgroupsv2; then
+        skip "'podman pause' (rootless) only works with cgroups v2"
+    fi
 
     cname=$(random_string 10)
     run_podman run -d --name $cname $IMAGE \
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index 3f50bd3c4..1c1e0f4ae 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -186,7 +186,6 @@ EOF
 # Confirm that container sees the correct id
 @test "podman volume with --userns=keep-id" {
     is_rootless || skip "only meaningful when run rootless"
-    skip_if_remote "FIXME: pending #7195"
 
     myvoldir=${PODMAN_TMPDIR}/volume_$(random_string)
     mkdir $myvoldir
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index d2454fbf4..a923402ac 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -82,6 +82,8 @@ load helpers
 
 # "network create" now works rootless, with the help of a special container
 @test "podman network create" {
+    skip_if_remote "FIXME: pending #7808"
+
     local mynetname=testnet-$(random_string 10)
     local mysubnet=$(random_rfc1918_subnet)
 
@@ -99,7 +101,7 @@ load helpers
        "Trying to create an already-existing network"
 
     run_podman network rm $mynetname
-    run_podman 125 network rm $mynetname
+    run_podman 1 network rm $mynetname
 
     # rootless CNI leaves behind an image pulled by SHA, hence with no tag.
     # Remove it if present; we can only remove it by ID.
diff --git a/test/system/build-testimage b/test/system/build-testimage
index ef14d3afd..53ade57f0 100755
--- a/test/system/build-testimage
+++ b/test/system/build-testimage
@@ -35,6 +35,12 @@ cd $tmpdir
 # 'image mount' test will confirm that this file exists and has our YMD tag
 echo $YMD >testimage-id
 
+# ...but set the timestamp on the file itself to a constant well-known
+# value, for use by the 'run --tz' test. Date value chosen for nerdiness
+# and because it's in the past. (Much as I'd love FFFFFFFF, we can't
+# use any future date because of unpredictable leap second adjustments).
+touch --date=@1600000000 testimage-id
+
 # 'pod' test will use this for --infra-command
 cat >pause <<EOF
 #!/bin/sh
@@ -49,6 +55,7 @@ EOF
 chmod 755 pause
 
 # alpine because it's small and light and reliable
+#    - check for updates @ https://hub.docker.com/_/alpine
 # busybox-extras provides httpd needed in 500-networking.bats
 cat >Containerfile <<EOF
 FROM docker.io/library/alpine:3.12.0
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 78571901d..998db5283 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -7,7 +7,7 @@ PODMAN=${PODMAN:-podman}
 PODMAN_TEST_IMAGE_REGISTRY=${PODMAN_TEST_IMAGE_REGISTRY:-"quay.io"}
 PODMAN_TEST_IMAGE_USER=${PODMAN_TEST_IMAGE_USER:-"libpod"}
 PODMAN_TEST_IMAGE_NAME=${PODMAN_TEST_IMAGE_NAME:-"testimage"}
-PODMAN_TEST_IMAGE_TAG=${PODMAN_TEST_IMAGE_TAG:-"20200917"}
+PODMAN_TEST_IMAGE_TAG=${PODMAN_TEST_IMAGE_TAG:-"20200929"}
 PODMAN_TEST_IMAGE_FQN="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:$PODMAN_TEST_IMAGE_TAG"
 
 # Because who wants to spell that out each time?
@@ -240,6 +240,16 @@ function is_remote() {
     [[ "$PODMAN" =~ -remote ]]
 }
 
+function is_cgroupsv1() {
+    # WARNING: This will break if there's ever a cgroups v3
+    ! is_cgroupsv2
+}
+
+function is_cgroupsv2() {
+    cgroup_type=$(stat -f -c %T /sys/fs/cgroup)
+    test "$cgroup_type" = "cgroupfs"
+}
+
 ###########################
 #  _add_label_if_missing  #  make sure skip messages include rootless/remote
 ###########################