Merge pull request #24686 from mtrmac/test-typo

Fix apparent typos in zstd:chunked tests

test/system/155-partial-pull.bats

@@ -11,7 +11,7 @@ load helpers.registry
 # BEGIN filtering - none of these tests will work with podman-remote
 
 function setup() {
-    skip_if_remote "none of these tests work with podman-remote"
+    skip_if_remote "zstd:chunked tests depend on start_registry (requires changing storage options); and on setting specific storage options. Neither works with podman-remote"
 
     basic_setup
     start_registry
@@ -25,7 +25,7 @@ function setup() {
 @test "push and pull zstd chunked image" {
     image1=localhost:${PODMAN_LOGIN_REGISTRY_PORT}/img1-$(safename)
 
-    globalargs="--pull-option enable_partial_pulls=true"
+    globalargs="--pull-option enable_partial_images=true"
     pushpullargs="--cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \
                   --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS}"
 
@@ -84,9 +84,12 @@ EOF
 
     run_podman $globalargs rmi $image2 $image3
 
-    run_podman $globalargs pull \
+    run_podman --log-level debug $globalargs pull \
                $pushpullargs \
                $image2
+    if [ "$(podman_storage_driver)" != vfs ]; then # VFS does not implement partial pulls
+        assert "$output" =~ "Retrieved partial blob" # A spot check that we are really using the partial-pull code path
+    fi
 
     run -0 skopeo inspect containers-storage:$image2
     assert "$output" =~ "application/vnd.oci.image.layer.v1.tar\+zstd" "pulled image must be zstd-compressed"
@@ -157,11 +160,12 @@ function mount_image_and_take_digest() {
 }
 
 @test "zstd chunked does not modify image content" {
+    skip_if_remote "need to mount an image" # remote tests are already skipped in setup, this is one more reason.
     skip_if_rootless "need to mount the image without unshare"
 
     image=localhost:${PODMAN_LOGIN_REGISTRY_PORT}/img-$(safename)
 
-    globalargs="--storage-driver $(podman_storage_driver) --pull-option enable_partial_pulls=true"
+    globalargs="--storage-driver $(podman_storage_driver) --pull-option enable_partial_images=true"
     pushpullargs="--cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \
                   --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS}"
 
@@ -182,9 +186,12 @@ EOF
 
     run_podman $globalargs rmi $image
 
-    run_podman $globalargs pull \
+    run_podman --log-level debug $globalargs pull \
                $pushpullargs \
                $image
+    if [ "$(podman_storage_driver)" != vfs ]; then # VFS does not implement partial pulls
+        assert "$output" =~ "Retrieved partial blob" # A spot check that we are really using the partial-pull code path
+    fi
 
     # expect that the image contains exactly the same data as before
     mount_image_and_take_digest $image