Blob Blame History Raw
From 79ee60c0e547a9023eeb7912b10fe363645f5d5a Mon Sep 17 00:00:00 2001
Message-Id: <79ee60c0e547a9023eeb7912b10fe363645f5d5a@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Jun 2020 12:23:48 +0200
Subject: [PATCH] qemublocktest: Replace 'basic' bitmap detection test case
 data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use test data which conforms to the new semantics which changed in the
previous patch.

The test data was created by the same set of commands as originally in
commit 9aac9d5bdab039a50de2d8c627b3a1f1578ed471

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit de32397007d5d2a9ca57791ec159f72f7666322b)
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
Message-Id: <f0985f5309514919dab4baedb04e4b3c214ae407.1592906423.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/qemublocktestdata/bitmap/basic.json | 229 +++++++++++-----------
 tests/qemublocktestdata/bitmap/basic.out  |   8 +-
 2 files changed, 119 insertions(+), 118 deletions(-)

diff --git a/tests/qemublocktestdata/bitmap/basic.json b/tests/qemublocktestdata/bitmap/basic.json
index 9d418b1a37..718106bf99 100644
--- a/tests/qemublocktestdata/bitmap/basic.json
+++ b/tests/qemublocktestdata/bitmap/basic.json
@@ -1,117 +1,118 @@
 [
-    {
-        "iops_rd": 0,
-        "detect_zeroes": "off",
-        "image": {
-            "virtual-size": 10485760,
-            "filename": "/tmp/pull4.qcow2",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-                "type": "qcow2",
-                "data": {
-                    "compat": "1.1",
-                    "lazy-refcounts": false,
-                    "refcount-bits": 16,
-                    "corrupt": false
-                }
-            },
-            "dirty-flag": false
-        },
-        "iops_wr": 0,
-        "ro": false,
-        "node-name": "libvirt-1-format",
-        "backing_file_depth": 0,
-        "drv": "qcow2",
-        "iops": 0,
-        "bps_wr": 0,
-        "write_threshold": 0,
-        "dirty-bitmaps": [
-            {
-                "name": "current",
-                "recording": true,
-                "persistent": true,
-                "busy": false,
-                "status": "active",
-                "granularity": 65536,
-                "count": 0
-            },
-            {
-                "name": "d",
-                "recording": false,
-                "persistent": true,
-                "busy": false,
-                "status": "disabled",
-                "granularity": 65536,
-                "count": 0
-            },
-            {
-                "name": "c",
-                "recording": false,
-                "persistent": true,
-                "busy": false,
-                "status": "disabled",
-                "granularity": 65536,
-                "count": 0
-            },
-            {
-                "name": "b",
-                "recording": false,
-                "persistent": true,
-                "busy": false,
-                "status": "disabled",
-                "granularity": 65536,
-                "count": 0
-            },
-            {
-                "name": "a",
-                "recording": false,
-                "persistent": true,
-                "busy": false,
-                "status": "disabled",
-                "granularity": 65536,
-                "count": 0
-            }
-        ],
-        "encrypted": false,
-        "bps": 0,
-        "bps_rd": 0,
-        "cache": {
-            "no-flush": false,
-            "direct": false,
-            "writeback": true
-        },
-        "file": "/tmp/pull4.qcow2",
-        "encryption_key_missing": false
+  {
+    "iops_rd": 0,
+    "detect_zeroes": "off",
+    "image": {
+      "virtual-size": 10485760,
+      "filename": "/tmp/bitmaps.qcow2",
+      "cluster-size": 65536,
+      "format": "qcow2",
+      "actual-size": 200704,
+      "format-specific": {
+        "type": "qcow2",
+        "data": {
+          "compat": "1.1",
+          "compression-type": "zlib",
+          "lazy-refcounts": false,
+          "refcount-bits": 16,
+          "corrupt": false
+        }
+      },
+      "dirty-flag": false
     },
-    {
-        "iops_rd": 0,
-        "detect_zeroes": "off",
-        "image": {
-            "virtual-size": 197120,
-            "filename": "/tmp/pull4.qcow2",
-            "format": "file",
-            "actual-size": 200704,
-            "dirty-flag": false
-        },
-        "iops_wr": 0,
-        "ro": false,
-        "node-name": "libvirt-1-storage",
-        "backing_file_depth": 0,
-        "drv": "file",
-        "iops": 0,
-        "bps_wr": 0,
-        "write_threshold": 0,
-        "encrypted": false,
-        "bps": 0,
-        "bps_rd": 0,
-        "cache": {
-            "no-flush": false,
-            "direct": false,
-            "writeback": true
-        },
-        "file": "/tmp/pull4.qcow2",
-        "encryption_key_missing": false
-    }
+    "iops_wr": 0,
+    "ro": false,
+    "node-name": "libvirt-1-format",
+    "backing_file_depth": 0,
+    "drv": "qcow2",
+    "iops": 0,
+    "bps_wr": 0,
+    "write_threshold": 0,
+    "dirty-bitmaps": [
+      {
+        "name": "current",
+        "recording": true,
+        "persistent": true,
+        "busy": false,
+        "status": "active",
+        "granularity": 65536,
+        "count": 0
+      },
+      {
+        "name": "d",
+        "recording": true,
+        "persistent": true,
+        "busy": false,
+        "status": "active",
+        "granularity": 65536,
+        "count": 0
+      },
+      {
+        "name": "c",
+        "recording": true,
+        "persistent": true,
+        "busy": false,
+        "status": "active",
+        "granularity": 65536,
+        "count": 0
+      },
+      {
+        "name": "b",
+        "recording": true,
+        "persistent": true,
+        "busy": false,
+        "status": "active",
+        "granularity": 65536,
+        "count": 0
+      },
+      {
+        "name": "a",
+        "recording": true,
+        "persistent": true,
+        "busy": false,
+        "status": "active",
+        "granularity": 65536,
+        "count": 0
+      }
+    ],
+    "encrypted": false,
+    "bps": 0,
+    "bps_rd": 0,
+    "cache": {
+      "no-flush": false,
+      "direct": false,
+      "writeback": true
+    },
+    "file": "/tmp/bitmaps.qcow2",
+    "encryption_key_missing": false
+  },
+  {
+    "iops_rd": 0,
+    "detect_zeroes": "off",
+    "image": {
+      "virtual-size": 197120,
+      "filename": "/tmp/bitmaps.qcow2",
+      "format": "file",
+      "actual-size": 200704,
+      "dirty-flag": false
+    },
+    "iops_wr": 0,
+    "ro": false,
+    "node-name": "libvirt-1-storage",
+    "backing_file_depth": 0,
+    "drv": "file",
+    "iops": 0,
+    "bps_wr": 0,
+    "write_threshold": 0,
+    "encrypted": false,
+    "bps": 0,
+    "bps_rd": 0,
+    "cache": {
+      "no-flush": false,
+      "direct": false,
+      "writeback": true
+    },
+    "file": "/tmp/bitmaps.qcow2",
+    "encryption_key_missing": false
+  }
 ]
diff --git a/tests/qemublocktestdata/bitmap/basic.out b/tests/qemublocktestdata/bitmap/basic.out
index 539f7d9bad..5c4c35b3f0 100644
--- a/tests/qemublocktestdata/bitmap/basic.out
+++ b/tests/qemublocktestdata/bitmap/basic.out
@@ -1,6 +1,6 @@
 libvirt-1-format:
   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-        c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-        b: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+        d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+        c: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+        b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
-- 
2.27.0