1 files changed, 9 insertions, 137 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff
index ad35e5926..bba737848 100644
--- a/test/buildah-bud/buildah-tests.diff
+++ b/test/buildah-bud/buildah-tests.diff
@@ -1,154 +1,26 @@
-From a49a2e48421c6f3bb1a56ae372de1f3d1a45d1f1 Mon Sep 17 00:00:00 2001
+From b948e99cb6cb4765987711e8d8948841f6d3f7e2 Mon Sep 17 00:00:00 2001
 From: Ed Santiago <santiago@redhat.com>
 Date: Tue, 9 Feb 2021 17:28:05 -0700
 Subject: [PATCH] tweaks for running buildah tests under podman
 
 Signed-off-by: Ed Santiago <santiago@redhat.com>
 ---
- tests/bud.bats     | 26 ++++++++++++++++----------
  tests/helpers.bash | 28 ++++++++++++++++++++++++----
- 2 files changed, 40 insertions(+), 14 deletions(-)
+ 1 file changed, 24 insertions(+), 4 deletions(-)
 
-diff --git a/tests/bud.bats b/tests/bud.bats
-index cf55d9a4..60cb6f96 100644
---- a/tests/bud.bats
-+++ b/tests/bud.bats
-@@ -4,7 +4,7 @@ load helpers
-
- @test "bud with a path to a Dockerfile (-f) containing a non-directory entry" {
-   run_buildah 125 bud -f ${TESTSDIR}/bud/non-directory-in-path/non-directory/Dockerfile
--  expect_output --substring "non-directory/Dockerfile: not a directory"
-+  expect_output --substring "Error: context must be a directory:"
- }
-
- @test "bud with --dns* flags" {
-@@ -117,6 +117,7 @@ symlink(subdir)"
- }
-
- @test "bud-flags-order-verification" {
-+  skip "N/A under podman"
-   run_buildah 125 bud /tmp/tmpdockerfile/ -t blabla
-   check_options_flag_err "-t"
-
-@@ -1416,13 +1417,13 @@ function _test_http() {
- @test "bud with dir for file but no Dockerfile in dir" {
-   target=alpine-image
-   run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json -t ${target} -f ${TESTSDIR}/bud/empty-dir ${TESTSDIR}/bud/empty-dir
--  expect_output --substring "no such file or directory"
-+  expect_output --substring "Error: context must be a directory:"
- }
-
- @test "bud with bad dir Dockerfile" {
-   target=alpine-image
-   run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json -t ${target} -f ${TESTSDIR}/baddirname ${TESTSDIR}/baddirname
--  expect_output --substring "no such file or directory"
-+  expect_output --substring "Error: context must be a directory:"
- }
-
- @test "bud with ARG before FROM default value" {
-@@ -1834,7 +1835,9 @@ _EOF
-   run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t test-img-2 --build-arg TEST=foo -f Dockerfile4 ${TESTSDIR}/bud/build-arg
-   run_buildah inspect -f '{{.FromImageID}}' test-img-2
-   argsid="$output"
--  [[ "$argsid" != "$initialid" ]]
-+  if [[ "$argsid" == "$initialid" ]]; then
-+      die ".FromImageID of test-img-2 ($argsid) == same as test-img, it should be different"
-+  fi
-
-   # Set the build-arg via an ENV in the local environment and verify that the cached layers are not used
-   export TEST=bar
-@@ -1887,6 +1890,7 @@ _EOF
- }
-
- @test "bud without any arguments should succeed" {
-+  skip "does not work under podman"
-   cd ${TESTSDIR}/bud/from-scratch
-   run_buildah bud --signature-policy ${TESTSDIR}/policy.json
- }
-@@ -1894,7 +1898,7 @@ _EOF
- @test "bud without any arguments should fail when no Dockerfile exist" {
-   cd $(mktemp -d)
-   run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json
--  expect_output --substring "no such file or directory"
-+  expect_output "Error: no context directory and no Containerfile specified"
- }
-
- @test "bud with specified context should fail if directory contains no Dockerfile" {
-@@ -1907,16 +1911,17 @@ _EOF
-   DIR=$(mktemp -d)
-   mkdir -p "$DIR"/Dockerfile
-   run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json "$DIR"
--  expect_output --substring "is not a file"
-+  expect_output --substring "Error: open .*: no such file or directory"
- }
-
- @test "bud with specified context should fail if context contains not-existing Dockerfile" {
-   DIR=$(mktemp -d)
-   run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json "$DIR"/Dockerfile
--  expect_output --substring "no such file or directory"
-+  expect_output --substring "context must be a directory"
- }
-
- @test "bud with specified context should succeed if context contains existing Dockerfile" {
-+  skip "podman requires a directory, not a Dockerfile"
-   DIR=$(mktemp -d)
-   echo "FROM alpine" > "$DIR"/Dockerfile
-   run_buildah 0 bud --signature-policy ${TESTSDIR}/policy.json "$DIR"/Dockerfile
-@@ -1968,7 +1973,7 @@ _EOF
-
- @test "bud-squash-hardlinks" {
-   _prefetch busybox
--  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --squash ${TESTSDIR}/bud/layers-squash/Dockerfile.hardlinks
-+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json --squash -f Dockerfile.hardlinks ${TESTSDIR}/bud/layers-squash
- }
-
- @test "bud with additional directory of devices" {
-@@ -2134,6 +2139,7 @@ _EOF
- }
-
- @test "bud with Containerfile should fail with nonexistent authfile" {
-+  skip "FIXME: podman issue #9572"
-   target=alpine-image
-   run_buildah 125 bud --authfile /tmp/nonexistent --signature-policy ${TESTSDIR}/policy.json -t ${target} ${TESTSDIR}/bud/containerfile
- }
-@@ -2261,6 +2267,7 @@ EOM
- }
-
- @test "bud with encrypted FROM image" {
-+  skip "Too much effort to spin up a local registry"
-   _prefetch busybox
-   mkdir ${TESTDIR}/tmp
-   openssl genrsa -out ${TESTDIR}/tmp/mykey.pem 1024
-@@ -2333,8 +2340,6 @@ EOM
-   _prefetch alpine
-   run_buildah bud --timestamp=0 --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages
-   cid=$output
--  run_buildah inspect --format '{{ .Docker.Created }}' timestamp
--  expect_output --substring "1970-01-01"
-   run_buildah inspect --format '{{ .OCIv1.Created }}' timestamp
-   expect_output --substring "1970-01-01"
-   run_buildah inspect --format '{{ .History }}' timestamp
-@@ -2594,6 +2599,7 @@ _EOF
- }
-
- @test "bud with --arch flag" {
-+  skip "FIXME: for podman, emergency skip to get CI going"
-   _prefetch alpine
-   mytmpdir=${TESTDIR}/my-dir
-   mkdir -p ${mytmpdir}
 diff --git a/tests/helpers.bash b/tests/helpers.bash
-index b28fd2c3..d42a6b82 100644
+index 99c290af..c5572840 100644
 --- a/tests/helpers.bash
 +++ b/tests/helpers.bash
 @@ -70,7 +70,7 @@ function _prefetch() {
-             mkdir -p ${_BUILDAH_IMAGE_CACHEDIR}
-         fi
+         mkdir -p ${_BUILDAH_IMAGE_CACHEDIR}
+     fi
 
--        local _podman_opts="--root ${TESTDIR}/root --storage-driver ${STORAGE_DRIVER}"
-+        local _podman_opts="--root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER}"
+-    local _podman_opts="--root ${TESTDIR}/root --storage-driver ${STORAGE_DRIVER}"
++    local _podman_opts="--root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER}"
 
-         for img in "$@"; do
-             echo "# [checking for: $img]" >&2
+     for img in "$@"; do
+         echo "# [checking for: $img]" >&2
 @@ -138,15 +138,35 @@ function run_buildah() {
          --retry)         retry=3;        shift;;  # retry network flakes
      esac