From 19ddcf925162a6bfa8304b627c6583d645cc496b Mon Sep 17 00:00:00 2001
From: TomSweeneyRedHat <tsweeney@redhat.com>
Date: Wed, 19 Jun 2019 10:46:48 -0400
Subject: Add RUN priv'd test for build

Podman 1.4.1 had problems with builds with a
RUN command that tried to to a privliged command.

This adds a gating test for that situation.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
---
 test/system/070-build.bats   |  3 ++-
 test/system/README.md        |  9 +++++++++
 test/test_podman_baseline.sh | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 53acf6edd..c1e7c7ec4 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -20,15 +20,16 @@ load helpers
     dockerfile=$tmpdir/Dockerfile
     cat >$dockerfile <<EOF
 FROM $IMAGE
+RUN apk add nginx
 RUN echo $rand_content > /$rand_filename
 EOF
 
     run_podman build -t build_test --format=docker $tmpdir
+    is "$output" ".*STEP 4: COMMIT" "COMMIT seen in log"
 
     run_podman run --rm build_test cat /$rand_filename
     is "$output"   "$rand_content"   "reading generated file in image"
 
     run_podman rmi build_test
 }
-
 # vim: filetype=sh
diff --git a/test/system/README.md b/test/system/README.md
index 6ac408f4e..d98b1c0fe 100644
--- a/test/system/README.md
+++ b/test/system/README.md
@@ -42,6 +42,15 @@ should be reserved for a first-pass fail-fast subset of tests:
 without having to wait for the entire test suite.
 
 
+Running tests
+=============
+To run the tests locally in your sandbox, you can use one of these methods:
+* make;PODMAN=./bin/podman bats ./test/system/070-build.bats # runs just the specified test
+* make;PODMAN=./bin/podman bats ./test/system                # runs all
+
+To test as root:
+*  $ PODMAN=./bin/podman sudo --preserve-env=PODMAN bats test/system
+
 Analyzing test failures
 =======================
 
diff --git a/test/test_podman_baseline.sh b/test/test_podman_baseline.sh
index 92bc8e20c..d205f544a 100755
--- a/test/test_podman_baseline.sh
+++ b/test/test_podman_baseline.sh
@@ -535,6 +535,28 @@ EOF
     rm -f $aaFile
 fi
 
+########
+# Build Dockerfile for RUN with priv'd command test
+########
+FILE=./Dockerfile
+/bin/cat <<EOM >$FILE
+FROM alpine
+RUN apk add nginx
+EOM
+chmod +x $FILE
+
+########
+# Build with the Dockerfile
+########
+podman build -f Dockerfile -t build-priv
+
+########
+# Cleanup
+########
+podman rm -a -f
+podman rmi -a -f
+rm ./Dockerfile
+
 ########
 # Build Dockerfile for WhaleSays test
 ########
-- 
cgit v1.2.3-54-g00ecf