|
 |
d76c62 |
From 06865f5dd0f1616a7f3ac8bc8edd259b362718ce Mon Sep 17 00:00:00 2001
|
|
|
d76c62 |
Message-Id: <06865f5dd0f1616a7f3ac8bc8edd259b362718ce@dist-git>
|
|
|
d76c62 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Date: Tue, 4 Feb 2020 15:08:10 +0100
|
|
|
d76c62 |
Subject: [PATCH] tests: qemublock: Add few more test cases for checkpoint
|
|
|
d76c62 |
deletion
|
|
|
d76c62 |
MIME-Version: 1.0
|
|
|
d76c62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d76c62 |
Content-Transfer-Encoding: 8bit
|
|
|
d76c62 |
|
|
|
d76c62 |
Add all intermediate steps and deletion of the current checkpoint on a
|
|
|
d76c62 |
flat (single-image) disk image.
|
|
|
d76c62 |
|
|
|
d76c62 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
(cherry picked from commit 0cf33ab8f178846c0b961fbc4cc6a4e92d351310)a
|
|
|
d76c62 |
|
|
|
d76c62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1207659
|
|
|
d76c62 |
Message-Id: <4b1466cba585cb4125ffda7fd2af4ab01d714f79.1580824112.git.pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
---
|
|
|
d76c62 |
tests/qemublocktest.c | 4 +++
|
|
|
d76c62 |
.../checkpointdelete/basic-current-out.json | 29 +++++++++++++++++++
|
|
|
d76c62 |
.../basic-intermediate1-out.json | 22 ++++++++++++++
|
|
|
d76c62 |
.../basic-intermediate2-out.json | 22 ++++++++++++++
|
|
|
d76c62 |
.../basic-intermediate3-out.json | 22 ++++++++++++++
|
|
|
d76c62 |
5 files changed, 99 insertions(+)
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
|
|
|
d76c62 |
index 80355d1340..f48e4ce4b2 100644
|
|
|
d76c62 |
--- a/tests/qemublocktest.c
|
|
|
d76c62 |
+++ b/tests/qemublocktest.c
|
|
|
d76c62 |
@@ -999,6 +999,10 @@ mymain(void)
|
|
|
d76c62 |
} while (0)
|
|
|
d76c62 |
|
|
|
d76c62 |
TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL);
|
|
|
d76c62 |
+ TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a");
|
|
|
d76c62 |
+ TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b");
|
|
|
d76c62 |
+ TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c");
|
|
|
d76c62 |
+ TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d");
|
|
|
d76c62 |
|
|
|
d76c62 |
cleanup:
|
|
|
d76c62 |
virHashFree(diskxmljsondata.schema);
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..1b607567e8
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
|
|
|
d76c62 |
@@ -0,0 +1,29 @@
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "d"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "target": "d",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-remove",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..eccb7ed15f
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
|
|
|
d76c62 |
@@ -0,0 +1,22 @@
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "target": "a",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-remove",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..de40e4b5b0
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
|
|
|
d76c62 |
@@ -0,0 +1,22 @@
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-remove",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..b5d85f43f0
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
|
|
|
d76c62 |
@@ -0,0 +1,22 @@
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "d"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-remove",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "d"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
--
|
|
|
d76c62 |
2.25.0
|
|
|
d76c62 |
|