rpms/libvirt
7
0
Fork 1
Code Issues Pull Requests Releases Activity
ab482d72cd
libvirt/SOURCES/libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch

402 lines
13 KiB
Diff
Raw Normal View History

import libvirt-6.0.0-27.module+el8.3.0+7602+4b93512e
2020-08-27 18:56:47 +00:00
From 4b9cb933c1501309a858130f5465313699840ec1 Mon Sep 17 00:00:00 2001
Message-Id: <4b9cb933c1501309a858130f5465313699840ec1@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Jun 2020 12:23:55 +0200
Subject: [PATCH] qemublocktest: Re-introduce testing of checkpoint deletion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Exercise the now arguably simpler checkpoint deletion code on the
'basic', 'snapshots', and 'synthetic' test data sets.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 2c5a3da365d9a33ff23458ca2a914f9d35ebd510)
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
Message-Id: <8df51bc8ee6e86fe36d971670ecdc89ecc989532.1592906423.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
tests/qemublocktest.c | 18 ++++++++
.../checkpointdelete/basic-current-out.json | 9 ++++
.../basic-intermediate1-out.json | 9 ++++
.../basic-intermediate2-out.json | 9 ++++
.../basic-intermediate3-out.json | 9 ++++
.../checkpointdelete/basic-noparent-out.json | 9 ++++
.../snapshots-current-out.json | 9 ++++
.../snapshots-intermediate1-out.json | 26 ++++++++++++
.../snapshots-intermediate2-out.json | 26 ++++++++++++
.../snapshots-intermediate3-out.json | 18 ++++++++
.../snapshots-noparent-out.json | 42 +++++++++++++++++++
.../synthetic-current-out.json | 9 ++++
.../synthetic-intermediate1-out.json | 11 +++++
.../synthetic-intermediate2-out.json | 11 +++++
.../synthetic-intermediate3-out.json | 19 +++++++++
.../synthetic-noparent-out.json | 11 +++++
16 files changed, 245 insertions(+)
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 0ec964c2c6..7c8f67dd6b 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1329,6 +1329,24 @@ mymain(void)
TEST_CHECKPOINT_DELETE("empty", "a", "empty");
+ TEST_CHECKPOINT_DELETE("basic-noparent", "a", "basic");
+ TEST_CHECKPOINT_DELETE("basic-intermediate1", "b", "basic");
+ TEST_CHECKPOINT_DELETE("basic-intermediate2", "c", "basic");
+ TEST_CHECKPOINT_DELETE("basic-intermediate3", "d", "basic");
+ TEST_CHECKPOINT_DELETE("basic-current", "current", "basic");
+
+ TEST_CHECKPOINT_DELETE("snapshots-noparent", "a", "snapshots");
+ TEST_CHECKPOINT_DELETE("snapshots-intermediate1", "b", "snapshots");
+ TEST_CHECKPOINT_DELETE("snapshots-intermediate2", "c", "snapshots");
+ TEST_CHECKPOINT_DELETE("snapshots-intermediate3", "d", "snapshots");
+ TEST_CHECKPOINT_DELETE("snapshots-current", "current", "snapshots");
+
+ TEST_CHECKPOINT_DELETE("synthetic-noparent", "a", "synthetic");
+ TEST_CHECKPOINT_DELETE("synthetic-intermediate1", "b", "synthetic");
+ TEST_CHECKPOINT_DELETE("synthetic-intermediate2", "c", "synthetic");
+ TEST_CHECKPOINT_DELETE("synthetic-intermediate3", "d", "synthetic");
+ TEST_CHECKPOINT_DELETE("synthetic-current", "current", "synthetic");
+
#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
do { \
blockbitmapvalidatedata.name = testname; \
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
new file mode 100644
index 0000000000..6ed1b63b66
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
new file mode 100644
index 0000000000..e1dd4920cd
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "b"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
new file mode 100644
index 0000000000..5638532d35
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "c"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
new file mode 100644
index 0000000000..8c56b0e689
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "d"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
new file mode 100644
index 0000000000..e87382fdb4
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "a"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
new file mode 100644
index 0000000000..6ed1b63b66
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
new file mode 100644
index 0000000000..1cde09131e
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
@@ -0,0 +1,26 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "b"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "b"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ }
+]
+reopen nodes:
+libvirt-3-format
+libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
new file mode 100644
index 0000000000..6fcd7ee0d1
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
@@ -0,0 +1,26 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "c"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ }
+]
+reopen nodes:
+libvirt-3-format
+libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
new file mode 100644
index 0000000000..2977dc3042
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
@@ -0,0 +1,18 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "d"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ }
+]
+reopen nodes:
+libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
new file mode 100644
index 0000000000..e4a6a413a3
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
@@ -0,0 +1,42 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "a"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "a"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "a"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+reopen nodes:
+libvirt-5-format
+libvirt-4-format
+libvirt-3-format
+libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
new file mode 100644
index 0000000000..6ed1b63b66
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
@@ -0,0 +1,9 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
new file mode 100644
index 0000000000..6eb9716aaa
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
@@ -0,0 +1,11 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ }
+]
+reopen nodes:
+libvirt-3-format
diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
new file mode 100644
index 0000000000..92b849cfc9
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
@@ -0,0 +1,11 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ }
+]
+reopen nodes:
+libvirt-3-format
diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
new file mode 100644
index 0000000000..466df52007
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
@@ -0,0 +1,19 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "d"
+ }
+ }
+]
+reopen nodes:
+libvirt-3-format
+libvirt-2-format
diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
new file mode 100644
index 0000000000..0479815f36
--- /dev/null
+++ b/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
@@ -0,0 +1,11 @@
+[
+ {
+ "type": "block-dirty-bitmap-remove",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+reopen nodes:
+libvirt-5-format
--
2.27.0
Reference in New Issue Copy Permalink