From b432209ed49d049af99b217707f10624b57b661f Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Thu, 19 Sep 2019 14:01:20 +0200
Subject: [PATCH] test: use --mount instead of --volume

Looks like we hit a Podman bug.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 test/01-from_rpms.bats      | 8 ++++----
 test/02-from_image_ref.bats | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/01-from_rpms.bats b/test/01-from_rpms.bats
index d50f64d..07aa5d3 100644
--- a/test/01-from_rpms.bats
+++ b/test/01-from_rpms.bats
@@ -7,19 +7,19 @@ load helpers
 	d=$(mktemp -d)
 	echo "temporary directory: ${d}"
 
-	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src 
+	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src
 	[ "$status" -eq 0 ]
 	[[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]]
 	# get the number of the last line
 	n=$(expr ${#lines[@]} - 1)
 	[[ ${lines[${n}]} =~ "[SrcImg][INFO] copied to oci:/output:latest-source" ]]
-	
+
 	echo "${d}"
 	[ -f "${d}/index.json" ]
 	[ -f "${d}/oci-layout" ]
 	[ "$(du -b ${d}/index.json | awk '{ print $1 }')" -gt 0 ]
 	[ "$(du -b ${d}/oci-layout | awk '{ print $1 }')" -gt 0 ]
-	
+
 	# let's press that the files are predictable
 	[ "$(find ${d} -type f | wc -l)" -eq 7 ]
 	[ -f "${d}/blobs/sha256/3afb43699ea82a69b16efb215363604d9e4ffe16c9ace7e53df66663847309cf" ]
@@ -32,7 +32,7 @@ load helpers
 	d=$(mktemp -d)
 	echo "temporary directory: ${d}"
 
-	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source
+	run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source
 	[ "$status" -eq 0 ]
 
 	run ls ${d}/pushed-image
diff --git a/test/02-from_image_ref.bats b/test/02-from_image_ref.bats
index 3925456..38ce66c 100644
--- a/test/02-from_image_ref.bats
+++ b/test/02-from_image_ref.bats
@@ -8,7 +8,7 @@ load helpers
     echo "temporary directory: ${d}"
 
     ref="registry.fedoraproject.org/fedora-minimal"
-	run_ctr -v ${d}:/output/ $CTR_IMAGE -i "${ref}"
+	run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}"
 	[ "$status" -eq 0 ]
 	#echo ${lines[@]}
 	[[ ${lines[0]} =~ "Getting image source signatures" ]]