From 80412bfbebec67795fbe7dbe926a85c5de46cbbf Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 8 Sep 2021 09:11:54 +0200
Subject: [PATCH] virstoragetest: Use pre-formatted file for non-path
 extraction test
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This one doesn't require using qemu-img either.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/virstoragetest.c                         |  13 +++----------
 .../images/qcow2_nbd-raw.qcow2                 | Bin 0 -> 196616 bytes
 .../virstoragetestdata/out/qcow2-qcow2_nbd-raw |   2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 96aeaef9ce..8d3dde265f 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -536,17 +536,10 @@ mymain(void)
     /* Qcow2 file with missing backing file but specified type */
     TEST_CHAIN("qcow2-qcow2_missing", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
 
-
-    /* Rewrite qcow2 to use an nbd: protocol as backend */
-    virCommandFree(cmd);
-    cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
-                               "-F", "raw", "-b", "nbd+tcp://example.org:6000/blah",
-                               "qcow2", NULL);
-    if (virCommandRun(cmd, NULL) < 0)
-        ret = -1;
-
     /* Qcow2 file with backing protocol instead of file */
-    TEST_CHAIN("qcow2-qcow2_nbd-raw", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS);
+    TEST_CHAIN("qcow2-qcow2_nbd-raw",
+               abs_srcdir "/virstoragetestdata/images/qcow2_nbd-raw.qcow2",
+               VIR_STORAGE_FILE_QCOW2, EXP_PASS);
 
     /* qed file */
     TEST_CHAIN("qed-qed_raw",
diff --git a/tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 b/tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..848da7ac9da8e115c7e2fbd334a25c1d7e6bfa28
GIT binary patch
literal 196616
zc-rmIF;3h-6b9h&E(hQSxF!<2N<qN^kRqj_O6^?_!IIau#)Dv~I3LHzDI%qbcS8yq
zaGiYLXhwR{%&&Rx=K9O85W+GXEl#K7Y}%)P>XY!QIG)QlRT1VngbaU+AN%u{LsF_9
zj`iL0=eH^9IfS}Nd0%dtJTJA__9@*DdG3ove9SR*Ra@3ouFBh{jql!HZu{Mk;y5;a
zSLXc?KkD+3-_@}$zkV)bms1nR_r4$6>S<r5c)RWIyF7mQ{V?^ptA=sr&=<ut;qpz-
zv)*-^`cvKxSF2Tgtad{iFZ%TT>T<nauQqLU7XSbN0000000000000000000000000
z0000000000000000000000000000000000000000000000001hf84?d0000000000
z00000000000000000000000000000000000000000000000000000000000000000
z0002~d&TPl0000000000000000000000000000000000000000000000000000000
Y00000000000000000000004l=Z+_rDlmGw#

literal 0
Hc-jL100001

diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw
index 64acdb880a..08a93b9f32 100644
--- a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw
+++ b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw
@@ -1,4 +1,4 @@
-path:ABS_BUILDDIR/virstoragedata/qcow2
+path:ABS_SRCDIR/virstoragetestdata/images/qcow2_nbd-raw.qcow2
 backingStoreRaw: nbd+tcp://example.org:6000/blah
 capacity: 1024
 encryption: 0
-- 
2.47.2