[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] iotests: improve 169
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 5/6] iotests: improve 169 |
Date: |
Tue, 26 Jun 2018 16:50:34 +0300 |
Before previous patch, iotest 169 was actually broken for the case
test_persistent__not_migbitmap__offline_shared, while formally
passing.
After migration log of vm_b had message:
qemu-system-x86_64: Could not reopen qcow2 layer: Bitmap already
exists: bitmap0
which means that invalidation failed and bs->drv = NULL.
It was because we've loaded bitmap twice: on open and on invalidation.
Add code to 169, to catch such fails.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
tests/qemu-iotests/169 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
index df408f8367..8b7947d650 100755
--- a/tests/qemu-iotests/169
+++ b/tests/qemu-iotests/169
@@ -24,6 +24,7 @@ import time
import itertools
import operator
import new
+import re
from iotests import qemu_img
@@ -133,6 +134,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
if should_migrate:
self.vm_b.shutdown()
+
+ # catch 'Could not reopen qcow2 layer: Bitmap already exists'
+ # possible error
+ log = self.vm_b.get_log()
+ log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
+ log = re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
+ self.assertEqual(log, '')
+
# recreate vm_b, as we don't want -incoming option (this will lead
# to "cat" process left alive after test finish)
self.vm_b = iotests.VM(path_suffix='b')
--
2.11.1
- [Qemu-devel] [PATCH 0/6] fix persistent bitmaps migration logic, Vladimir Sementsov-Ogievskiy, 2018/06/26
- [Qemu-devel] [PATCH 1/6] iotests: 169: drop deprecated 'autoload' parameter, Vladimir Sementsov-Ogievskiy, 2018/06/26
- [Qemu-devel] [PATCH 2/6] block/qcow2: improve error message in qcow2_inactivate, Vladimir Sementsov-Ogievskiy, 2018/06/26
- [Qemu-devel] [PATCH 5/6] iotests: improve 169,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 4/6] dirty-bitmaps: clean-up bitmaps loading and migration logic, Vladimir Sementsov-Ogievskiy, 2018/06/26
- [Qemu-devel] [PATCH 3/6] bloc/qcow2: drop dirty_bitmaps_loaded state variable, Vladimir Sementsov-Ogievskiy, 2018/06/26
- [Qemu-devel] [PATCH 6/6] iotests: 169: add cases for source vm resuming, Vladimir Sementsov-Ogievskiy, 2018/06/26
- Re: [Qemu-devel] [PATCH 0/6] fix persistent bitmaps migration logic, John Snow, 2018/06/26
- Re: [Qemu-devel] [PATCH 0/6] fix persistent bitmaps migration logic, John Snow, 2018/06/26