Merge #2236

2236: Run stat command directly for volume ownership test r=rhatdan a=carbonin #### What type of PR is this? /kind failing-test #### What this PR does / why we need it: This removes the script previously used which may have been causing #2235 cc @edsantiago @rhatdan Co-authored-by: Nick Carboni <ncarboni@redhat.com>
containers · Mar 19, 2020 · f69aff0 · f69aff0
2 parents 843d15d + 85fe5cc
commit f69aff0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/tests/bud.bats b/tests/bud.bats
@@ -608,7 +608,8 @@ load helpers
   run_buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} ${TESTSDIR}/bud/volume-ownership
   run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ${target}
   cid=$output
-  run_buildah run $cid test-ownership
+  run_buildah run $cid stat -c "%U %G" /vol/subvol
+  expect_output "testuser testgroup"
 }
 
 @test "bud-from-glob" {

diff --git a/tests/bud/volume-ownership/Dockerfile b/tests/bud/volume-ownership/Dockerfile
@@ -1,7 +1,10 @@
 FROM alpine
-ADD test-ownership /usr/bin/
 RUN adduser -D -H testuser && addgroup testgroup
 RUN mkdir -p /vol/subvol
 RUN chown testuser:testgroup /vol/subvol
 VOLUME /vol/subvol
+
+# Run some command after VOLUME to ensure that the volume cache behavior is invoked
+# See https://github.com/containers/buildah/blob/843d15de3e797bd912607d27324d13a9d5c27dfb/imagebuildah/stage_executor.go#L61-L72 and
+# for more details
 RUN touch /test
diff --git a/tests/bud/volume-ownership/test-ownership b/tests/bud/volume-ownership/test-ownership