mirror of https://github.com/xemu-project/xemu.git
iotests: Conditionally silence certain AQMP errors
AQMP likes to be very chatty about errors it encounters. In general, this is good because it allows us to get good diagnostic information for otherwise complex async failures. For example, during a failed QMP connection attempt, we might see: +ERROR:qemu.aqmp.qmp_client.qemub-2536319:Negotiation failed: EOFError +ERROR:qemu.aqmp.qmp_client.qemub-2536319:Failed to establish session: EOFError This might be nice in iotests output, because failure scenarios involving the new QMP library will be spelled out plainly in the output diffs. For tests that are intentionally causing this scenario though, filtering that log output could be a hassle. For now, add a context manager that simply lets us toggle this output off during a critical region. (Additionally, a forthcoming patch allows the use of either legacy or async QMP to be toggled with an environment variable. In this circumstance, we can't amend the iotest output to just always expect the error message, either. Just suppress it for now. More rigorous log filtering can be investigated later if/when it is deemed safe to permanently replace the legacy QMP library.) Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-id: 20211026175612.4127598-6-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
3bd559467d
commit
206dc47548
|
@ -30,7 +30,7 @@ import struct
|
|||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from typing import (Any, Callable, Dict, Iterable,
|
||||
from typing import (Any, Callable, Dict, Iterable, Iterator,
|
||||
List, Optional, Sequence, TextIO, Tuple, Type, TypeVar)
|
||||
import unittest
|
||||
|
||||
|
@ -114,6 +114,24 @@ luks_default_key_secret_opt = 'key-secret=keysec0'
|
|||
sample_img_dir = os.environ['SAMPLE_IMG_DIR']
|
||||
|
||||
|
||||
@contextmanager
|
||||
def change_log_level(
|
||||
logger_name: str, level: int = logging.CRITICAL) -> Iterator[None]:
|
||||
"""
|
||||
Utility function for temporarily changing the log level of a logger.
|
||||
|
||||
This can be used to silence errors that are expected or uninteresting.
|
||||
"""
|
||||
_logger = logging.getLogger(logger_name)
|
||||
current_level = _logger.level
|
||||
_logger.setLevel(level)
|
||||
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
_logger.setLevel(current_level)
|
||||
|
||||
|
||||
def unarchive_sample_image(sample, fname):
|
||||
sample_fname = os.path.join(sample_img_dir, sample + '.bz2')
|
||||
with bz2.open(sample_fname) as f_in, open(fname, 'wb') as f_out:
|
||||
|
|
|
@ -26,7 +26,7 @@ from qemu.machine import machine
|
|||
from qemu.qmp import QMPConnectError
|
||||
|
||||
import iotests
|
||||
from iotests import qemu_img
|
||||
from iotests import change_log_level, qemu_img
|
||||
|
||||
|
||||
image_size = 1 * 1024 * 1024
|
||||
|
@ -100,9 +100,13 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
|
|||
self.vm_b.add_blockdev(f'file,node-name=drive0,filename={source}')
|
||||
self.vm_b.add_device('virtio-blk,drive=drive0,share-rw=on')
|
||||
try:
|
||||
self.vm_b.launch()
|
||||
print('ERROR: VM B launched successfully, this should not have '
|
||||
'happened')
|
||||
# Silence AQMP errors temporarily.
|
||||
# TODO: Remove this and just allow the errors to be logged when
|
||||
# AQMP fully replaces QMP.
|
||||
with change_log_level('qemu.aqmp'):
|
||||
self.vm_b.launch()
|
||||
print('ERROR: VM B launched successfully, '
|
||||
'this should not have happened')
|
||||
except (QMPConnectError, ConnectError):
|
||||
assert 'Is another process using the image' in self.vm_b.get_log()
|
||||
|
||||
|
|
Loading…
Reference in New Issue