mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
iotests/300: avoid abnormal shutdown race condition
Wait for the destination VM to close itself instead of racing to shut it down first, which produces different error log messages from AQMP depending on precisely when we tried to shut it down. (For example: We may try to issue 'quit' immediately prior to the target VM closing its QMP socket, which will cause an ECONNRESET error to be logged. Waiting for the VM to exit itself avoids the race on shutdown behavior.) Reported-by: Hanna Reitz <hreitz@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-id: 20211026175612.4127598-7-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
206dc47548
commit
8f05aee533
|
@ -24,8 +24,6 @@ import random
|
|||
import re
|
||||
from typing import Dict, List, Optional
|
||||
|
||||
from qemu.machine import machine
|
||||
|
||||
import iotests
|
||||
|
||||
|
||||
|
@ -461,12 +459,11 @@ class TestBlockBitmapMappingErrors(TestDirtyBitmapMigration):
|
|||
f"'{self.src_node_name}': Name is longer than 255 bytes",
|
||||
log)
|
||||
|
||||
# Expect abnormal shutdown of the destination VM because of
|
||||
# the failed migration
|
||||
try:
|
||||
self.vm_b.shutdown()
|
||||
except machine.AbnormalShutdown:
|
||||
pass
|
||||
# Destination VM will terminate w/ error of its own accord
|
||||
# due to the failed migration.
|
||||
self.vm_b.wait()
|
||||
rc = self.vm_b.exitcode()
|
||||
assert rc is not None and rc > 0
|
||||
|
||||
def test_aliased_bitmap_name_too_long(self) -> None:
|
||||
# Longer than the maximum for bitmap names
|
||||
|
|
Loading…
Reference in a new issue