2 files changed, 38 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index b2999a9e7..39ade22af 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -668,4 +668,15 @@ json-file | f
     is "$output" ".*HOME=/.*"
 }
 
+@test "podman run --tty -i failure with no tty" {
+    run_podman run --tty -i --rm $IMAGE echo hello < /dev/null
+    is "$output" ".*The input device is not a TTY.*"
+
+    run_podman run --tty=false -i --rm $IMAGE echo hello < /dev/null
+    is "$output" "hello"
+
+    run_podman run --tty -i=false --rm $IMAGE echo hello < /dev/null
+    is "$output" "hello"
+}
+
 # vim: filetype=sh
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 8f6cdb46b..e5b68a0d8 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -668,6 +668,33 @@ EOF
   run_podman image prune -f
 }
 
+@test "podman build --pull-never" {
+    local tmpdir=$PODMAN_TMPDIR/build-test
+    mkdir -p $tmpdir
+
+    # First, confirm that --pull-never is a NOP if image exists locally
+    local random_string=$(random_string 15)
+
+    cat >$tmpdir/Containerfile <<EOF
+FROM $IMAGE
+RUN echo $random_string
+EOF
+
+    run_podman build -t build_test --pull-never $tmpdir
+    is "$output" ".*$random_string" "pull-never is OK if image already exists"
+    run_podman rmi build_test
+
+    # Now try an image that does not exist locally nor remotely
+    cat >$tmpdir/Containerfile <<EOF
+FROM quay.io/libpod/nosuchimage:nosuchtag
+RUN echo $random_string
+EOF
+
+    run_podman 125 build -t build_test --pull-never $tmpdir
+    is "$output" ".* pull policy is .never. but .* could not be found locally" \
+       "--pull-never fails with expected error message"
+}
+
 @test "podman build --logfile test" {
     tmpdir=$PODMAN_TMPDIR/build-test
     mkdir -p $tmpdir