qemublocktest: Add 'empty' case for checkpoint deletion

Use the new test data for checkpoint deletion testing. This test also
requires modification of the internals to allow checking for test
failure.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-28 16:30:06 +02:00
parent 218d00f443
commit 88f175d887
2 changed files with 8 additions and 6 deletions

View File

@ -851,14 +851,13 @@ testQemuCheckpointDeleteMerge(const void *opaque)
data->parentbitmap,
actions,
"testdisk",
&reopenimages) < 0) {
VIR_TEST_VERBOSE("failed to generate checkpoint delete transaction\n");
return -1;
&reopenimages) >= 0) {
if (virJSONValueToBuffer(actions, &buf, true) < 0)
return -1;
} else {
virBufferAddLit(&buf, "NULL\n");
}
if (virJSONValueToBuffer(actions, &buf, true) < 0)
return -1;
if (reopenimages) {
virBufferAddLit(&buf, "reopen nodes:\n");
@ -1333,6 +1332,8 @@ mymain(void)
ret = -1; \
} while (0)
TEST_CHECKPOINT_DELETE_MERGE("empty", "a", NULL, "empty");
TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL, "basic");
TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a", "basic");
TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b", "basic");

View File

@ -0,0 +1 @@
NULL