Skip to content

Commit 58b47ab

Browse files
committed
CP-311613: do not attempt to export delta VHD from SMAPIv3
VHD export takes various shortcuts, and delta export only works if the source is also VHD. Otherwise it fails with: `Failure("Cannot compute differences on non-VHD images")` If the source is already qcow2, like for SMAPIv3, then this is not (yet) expected to work, so skip those tests on SMAPIv3 for now. Note that regular export works, it is just the delta export that fails (specifying `base=` in `xe vdi-export`). Signed-off-by: Edwin Török <edwin.torok@citrix.com> (cherry picked from commit 8ac4476)
1 parent 052d494 commit 58b47ab

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

ocaml/quicktest/quicktest_vdi_ops_data_integrity.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ let large_data_integrity_tests vdi_op op_name =
256256
let sr_with_vdi_create_destroy =
257257
Qt_filter.SR.(all |> allowed_operations [`vdi_create; `vdi_destroy] |> not_iso)
258258

259-
let supported_srs test_case =
259+
let supported_srs ?(f = Fun.id) test_case =
260260
let open Qt_filter in
261-
test_case |> conn |> sr sr_with_vdi_create_destroy
261+
test_case |> conn |> sr (f sr_with_vdi_create_destroy)
262262

263263
(* XXX Currently only GFS2 SRs support sparse reading of VDIs exported as TAR *)
264264
let supported_gfs2_srs test_case =
@@ -276,7 +276,7 @@ let tests () =
276276
)
277277
@ (delta_data_integrity_tests delta_export_import_vhd
278278
"VDI delta export/import to/from VHD file"
279-
|> supported_srs
279+
|> supported_srs ~f:Qt_filter.SR.smapiv1
280280
)
281281
@ (data_integrity_tests export_import_tar "VDI export/import to/from TAR file"
282282
|> supported_srs

0 commit comments

Comments
 (0)