tests: qemublock: Add few more test cases for checkpoint deletion

Add all intermediate steps and deletion of the current checkpoint on a
flat (single-image) disk image.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>

tests/qemublocktest.c

@@ -1003,6 +1003,10 @@ mymain(void)
     } while (0)
 
     TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL);
+    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a");
+    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b");
+    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c");
+    TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d");
 
  cleanup:
     virHashFree(diskxmljsondata.schema);

tests/qemublocktestdata/checkpointdelete/basic-current-out.json

+[
+  {
+    "type": "block-dirty-bitmap-enable",
+    "data": {
+      "node": "libvirt-1-format",
+      "name": "d"
+    }
+  },
+  {
+    "type": "block-dirty-bitmap-merge",
+    "data": {
+      "node": "libvirt-1-format",
+      "target": "d",
+      "bitmaps": [
+        {
+          "node": "libvirt-1-format",
+          "name": "current"
+        }
+      ]
+    }
+  },
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "libvirt-1-format",
+      "name": "current"
+    }
+  }
+]

tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json

+[
+  {
+    "type": "block-dirty-bitmap-merge",
+    "data": {
+      "node": "libvirt-1-format",
+      "target": "a",
+      "bitmaps": [
+        {
+          "node": "libvirt-1-format",
+          "name": "b"
+        }
+      ]
+    }
+  },
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "libvirt-1-format",
+      "name": "b"
+    }
+  }
+]

tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json

+[
+  {
+    "type": "block-dirty-bitmap-merge",
+    "data": {
+      "node": "libvirt-1-format",
+      "target": "b",
+      "bitmaps": [
+        {
+          "node": "libvirt-1-format",
+          "name": "c"
+        }
+      ]
+    }
+  },
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "libvirt-1-format",
+      "name": "c"
+    }
+  }
+]

tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json

+[
+  {
+    "type": "block-dirty-bitmap-merge",
+    "data": {
+      "node": "libvirt-1-format",
+      "target": "c",
+      "bitmaps": [
+        {
+          "node": "libvirt-1-format",
+          "name": "d"
+        }
+      ]
+    }
+  },
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "libvirt-1-format",
+      "name": "d"
+    }
+  }
+]