4 files changed, 96 insertions, 2 deletions
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/500-networking.bats b/test/system/500-networking.bats
index 419d325b0..495c7948b 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -139,7 +139,7 @@ load helpers
                    $IMAGE nc -l -n -v -p $myport
         cid="$output"
 
-        wait_for_port 127.0.0.1 $myport
+        wait_for_output "listening on .*:$myport .*" $cid
 
         # emit random string, and check it
         teststring=$(random_string 30)
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 02fd7252c..bd9471ace 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -288,7 +288,7 @@ function wait_for_port() {
 
     # Wait
     while [ $_timeout -gt 0 ]; do
-        { exec 3<> /dev/tcp/$host/$port; } &>/dev/null && return
+        { exec 5<> /dev/tcp/$host/$port; } &>/dev/null && return
         sleep 1
         _timeout=$(( $_timeout - 1 ))
     done