4 files changed, 155 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 32fc85c4e..3d9d834b3 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -706,4 +706,21 @@ EOF
     run_podman rmi nomtab
 }
 
+@test "podman run --device-cgroup-rule tests" {
+    skip_if_rootless "cannot add devices in rootless mode"
+
+    run_podman run --device-cgroup-rule="b 7:* rmw" --rm $IMAGE
+    run_podman run --device-cgroup-rule="c 7:* rmw" --rm $IMAGE
+    run_podman run --device-cgroup-rule="a 7:1 rmw" --rm $IMAGE
+    run_podman run --device-cgroup-rule="a 7 rmw" --rm $IMAGE
+    run_podman 125 run --device-cgroup-rule="b 7:* rmX" --rm $IMAGE
+    is "$output" "Error: invalid device access in device-access-add: X"
+    run_podman 125 run --device-cgroup-rule="b 7:2" --rm $IMAGE
+    is "$output" 'Error: invalid device cgroup rule requires type, major:Minor, and access rules: "b 7:2"'
+    run_podman 125 run --device-cgroup-rule="x 7:* rmw" --rm $IMAGE
+    is "$output" "Error: invalid device type in device-access-add:"
+    run_podman 125 run --device-cgroup-rule="a a:* rmw" --rm $IMAGE
+    is "$output" "Error: strconv.ParseInt: parsing \"a\": invalid syntax"
+}
+
 # vim: filetype=sh
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index ccf83df14..32282c8e1 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -24,6 +24,9 @@ load helpers
     # test --since with Unix timestamps
     run_podman logs --since 1000 $cid
 
+    # test --until with Unix timestamps
+    run_podman logs --until 1000 $cid
+
     run_podman rm $cid
 }
 
@@ -125,4 +128,50 @@ $s_after"
     _log_test_since journald
 }
 
+function _log_test_until() {
+    local driver=$1
+
+    s_before="before_$(random_string)_${driver}"
+    s_after="after_$(random_string)_${driver}"
+
+    before=$(date --iso-8601=seconds)
+    sleep 5
+    run_podman run --log-driver=$driver -d --name test $IMAGE sh -c \
+        "echo $s_before; trap 'echo $s_after; exit' SIGTERM; while :; do sleep 1; done"
+
+    # sleep a second to make sure the date is after the first echo
+    sleep 1
+    run_podman stop test
+    # sleep for 20 seconds to get the proper after time
+    sleep 20
+
+    run_podman logs test
+    is "$output" \
+        "$s_before
+$s_after"
+
+    run_podman logs --until $before test
+    is "$output" \
+        ""
+
+    after=$(date --iso-8601=seconds)
+
+    run_podman logs --until $after test
+    is "$output" \
+        "$s_before
+$s_after"
+    run_podman rm -f test
+}
+
+@test "podman logs - until k8s-file" {
+    _log_test_until k8s-file
+}
+
+@test "podman logs - until journald" {
+    # We can't use journald on RHEL as rootless: rhbz#1895105
+    skip_if_journald_unavailable
+
+    _log_test_until journald
+}
+
 # vim: filetype=sh
diff --git a/test/system/125-import.bats b/test/system/125-import.bats
new file mode 100644
index 000000000..c53711618
--- /dev/null
+++ b/test/system/125-import.bats
@@ -0,0 +1,45 @@
+#!/usr/bin/env bats   -*- bats -*-
+#
+# tests for podman import
+#
+
+load helpers
+
+@test "podman import" {
+    local archive=$PODMAN_TMPDIR/archive.tar
+    local random_content=$(random_string 12)
+    # Generate a random name and tag (must be lower-case)
+    local random_name=x0$(random_string 12 | tr A-Z a-z)
+    local random_tag=t0$(random_string 7 | tr A-Z a-z)
+    local fqin=localhost/$random_name:$random_tag
+
+    run_podman run --name import $IMAGE sh -c "echo ${random_content} > /random.txt"
+    run_podman export import -o $archive
+    run_podman rm -f import
+
+    # Simple import
+    run_podman import -q $archive
+    iid="$output"
+    run_podman run -t --rm $iid cat /random.txt
+    is "$output" "$random_content" "simple import"
+    run_podman rmi -f $iid
+
+    # Simple import via stdin
+    run_podman import -q - < <(cat $archive)
+    iid="$output"
+    run_podman run -t --rm $iid cat /random.txt
+    is "$output" "$random_content" "simple import via stdin"
+    run_podman rmi -f $iid
+
+    # Tagged import
+    run_podman import -q $archive $fqin
+    run_podman run -t --rm $fqin cat /random.txt
+    is "$output" "$random_content" "tagged import"
+    run_podman rmi -f $fqin
+
+    # Tagged import via stdin
+    run_podman import -q - $fqin < <(cat $archive)
+    run_podman run -t --rm $fqin cat /random.txt
+    is "$output" "$random_content" "tagged import via stdin"
+    run_podman rmi -f $fqin
+}
diff --git a/test/system/271-tcp-cors-server.bats b/test/system/271-tcp-cors-server.bats
new file mode 100644
index 000000000..cdfa82e82
--- /dev/null
+++ b/test/system/271-tcp-cors-server.bats
@@ -0,0 +1,44 @@
+#!/usr/bin/env bats   -*- bats -*-
+#
+# Tests podman system service CORS enabled
+#
+
+load helpers
+
+SERVICE_NAME="podman_test_$(random_string)"
+
+SERVICE_TCP_HOST="localhost"
+
+SERVICE_FILE="$UNIT_DIR/$SERVICE_NAME.service"
+SOCKET_FILE="$UNIT_DIR/$SERVICE_NAME.socket"
+
+@test "podman system service - tcp CORS" {
+    skip_if_remote "system service tests are meaningless over remote"
+    PORT=$(( ((RANDOM<<15)|RANDOM) % 63001 + 2000 ))
+    run_podman system service --cors="*" tcp:$SERVICE_TCP_HOST:$PORT -t 20 &
+    podman_pid="$!"
+    sleep 5s
+    run curl -s --max-time 10 -vvv $SERVICE_TCP_HOST:$PORT/_ping 2>&1
+    is "$output" ".*< Access-Control-Allow-Origin: \*.*" "access-control-allow-origin verifies CORS is set"
+    kill $podman_pid
+    wait $podman_pid || true
+}
+
+@test "podman system service - tcp without CORS" {
+    skip_if_remote "system service tests are meaningless over remote"
+    PORT=$(( ((RANDOM<<15)|RANDOM) % 63001 + 2000 ))
+    run_podman system service tcp:$SERVICE_TCP_HOST:$PORT -t 20 &
+    podman_pid="$!"
+    sleep 5s
+    (curl -s --max-time 10 -vvv $SERVICE_TCP_HOST:$PORT/_ping 2>&1 | grep -Eq "Access-Control-Allow-Origin:") && false || true
+    kill $podman_pid
+    wait $podman_pid || true
+}
+
+@test "podman system service - CORS enabled in logs" {
+    skip_if_remote "system service tests are meaningless over remote"
+    run_podman system service --log-level="debug" --cors="*" -t 1
+    is "$output" ".*CORS Headers were set to \*.*" "debug log confirms CORS headers set"
+}
+
+# vim: filetype=sh