qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com,
	armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com,
	andrey.shinkevich@virtuozzo.com, den@openvz.org
Subject: [PATCH v5 4/4] tests/qemu-iotests: add case for block-stream compress
Date: Sun, 20 Oct 2019 23:37:08 +0300	[thread overview]
Message-ID: <1571603828-185910-5-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1571603828-185910-1-git-send-email-andrey.shinkevich@virtuozzo.com>

Add a case to the iotest #030 that tests the 'compress' option for a
block-stream job.

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
 tests/qemu-iotests/030     | 34 +++++++++++++++++++++++++++++++++-
 tests/qemu-iotests/030.out |  4 ++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index f3766f2..f33fd21 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -21,7 +21,8 @@
 import time
 import os
 import iotests
-from iotests import qemu_img, qemu_io
+from iotests import qemu_img, qemu_io, qemu_img_pipe
+import json
 
 backing_img = os.path.join(iotests.test_dir, 'backing.img')
 mid_img = os.path.join(iotests.test_dir, 'mid.img')
@@ -956,6 +957,37 @@ class TestSetSpeed(iotests.QMPTestCase):
 
         self.cancel_and_wait(resume=True)
 
+class TestCompressed(iotests.QMPTestCase):
+    allocated_clusters = 8
+
+    def setUp(self):
+        qemu_img('create', '-f', iotests.imgfmt, backing_img, '1M')
+        qemu_img('create', '-f', iotests.imgfmt, '-o',
+                 'backing_file={}'.format(backing_img), test_img)
+        cluster_size = 0x10000
+        data_size = self.allocated_clusters * cluster_size
+        qemu_io('-c', 'write -P 0x1 0 {}'.format(data_size), backing_img)
+        self.vm = iotests.VM().add_drive(test_img, "compress=on")
+        self.vm.launch()
+
+    def tearDown(self):
+        self.vm.shutdown()
+        os.remove(test_img)
+        os.remove(backing_img)
+
+    def test_stream_compress(self):
+        self.assert_no_active_block_jobs()
+
+        result = self.vm.qmp('block-stream', device='drive0')
+        self.assert_qmp(result, 'return', {})
+
+        match = {'data': {'type': 'stream', 'device': 'drive0'}}
+        self.vm.event_wait(name='BLOCK_JOB_COMPLETED', match=match)
+        self.vm.shutdown()
+
+        top = json.loads(qemu_img_pipe('check', '--output=json', test_img))
+        self.assertEqual(top['compressed-clusters'], self.allocated_clusters)
+
 if __name__ == '__main__':
     iotests.main(supported_fmts=['qcow2', 'qed'],
                  supported_protocols=['file'])
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
index 6d9bee1..af8dac1 100644
--- a/tests/qemu-iotests/030.out
+++ b/tests/qemu-iotests/030.out
@@ -1,5 +1,5 @@
-...........................
+............................
 ----------------------------------------------------------------------
-Ran 27 tests
+Ran 28 tests
 
 OK
-- 
1.8.3.1



  parent reply	other threads:[~2019-10-20 20:38 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-20 20:37 [PATCH v5 0/4] qcow2: advanced compression options Andrey Shinkevich
2019-10-20 20:37 ` [PATCH v5 1/4] block: support compressed write at generic layer Andrey Shinkevich
2019-10-22  9:28   ` Max Reitz
2019-10-22 10:21     ` Andrey Shinkevich
2019-10-22 10:46       ` Vladimir Sementsov-Ogievskiy
2019-10-22 11:31         ` Max Reitz
2019-10-22 12:23           ` Vladimir Sementsov-Ogievskiy
2019-10-22 12:56             ` Max Reitz
2019-10-22 13:53               ` Andrey Shinkevich
2019-10-24  9:34                 ` Max Reitz
2019-10-24 12:56                   ` Andrey Shinkevich
2019-10-24 13:48                     ` Max Reitz
2019-10-24 14:07                       ` Andrey Shinkevich
2019-10-24 15:12                         ` Max Reitz
2019-10-24 14:27                       ` Andrey Shinkevich
2019-10-22 14:28               ` Vladimir Sementsov-Ogievskiy
2019-10-20 20:37 ` [PATCH v5 2/4] qcow2: Allow writing compressed data of multiple clusters Andrey Shinkevich
2019-10-20 20:37 ` [PATCH v5 3/4] tests/qemu-iotests: add case to write " Andrey Shinkevich
2019-10-20 20:37 ` Andrey Shinkevich [this message]
2019-10-22  9:28   ` [PATCH v5 4/4] tests/qemu-iotests: add case for block-stream compress Max Reitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1571603828-185910-5-git-send-email-andrey.shinkevich@virtuozzo.com \
    --to=andrey.shinkevich@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=den@openvz.org \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).