tests/functional: use self.log for all logging
Some tests are creating their on logger category which means any output they log is not captured in base.log. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> [thuth: drop changes to reverse_debugging.py (it's WIP in other patches)] Message-ID: <20250912182200.643909-7-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé
Thomas Huth
parent
5383ccf251
commit
8a44d8c2ac
5 changed files with 25 additions and 32 deletions
|
|
@ -72,8 +72,6 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
self.set_machine('virt')
|
||||
self.require_accelerator("tcg")
|
||||
|
||||
logger = logging.getLogger('aarch64_virt')
|
||||
|
||||
kernel_path = self.ASSET_KERNEL.fetch()
|
||||
|
||||
self.vm.set_console()
|
||||
|
|
@ -91,7 +89,7 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
# Also add a scratch block device
|
||||
logger.info('creating scratch qcow2 image')
|
||||
self.log.info('creating scratch qcow2 image')
|
||||
image_path = self.scratch_file('scratch.qcow2')
|
||||
qemu_img = get_qemu_img(self)
|
||||
check_call([qemu_img, 'create', '-f', 'qcow2', image_path, '8M'],
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@ class IntegratorMachine(QemuSystemTest):
|
|||
command_line='screendump %s' % screendump_path)
|
||||
if 'unknown command' in res:
|
||||
self.skipTest('screendump not available')
|
||||
logger = logging.getLogger('framebuffer')
|
||||
|
||||
cpu_count = 1
|
||||
match_threshold = 0.92
|
||||
|
|
@ -88,7 +87,7 @@ class IntegratorMachine(QemuSystemTest):
|
|||
loc = np.where(result >= match_threshold)
|
||||
tux_count = 0
|
||||
for tux_count, pt in enumerate(zip(*loc[::-1]), start=1):
|
||||
logger.debug('found Tux at position [x, y] = %s', pt)
|
||||
self.log.debug('found Tux at position [x, y] = %s', pt)
|
||||
self.assertGreaterEqual(tux_count, cpu_count)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
|
|
@ -159,7 +159,6 @@ class MaltaMachineFramebuffer(LinuxKernelTest):
|
|||
command_line='screendump %s' % screendump_path)
|
||||
if 'unknown command' in res:
|
||||
self.skipTest('screendump not available')
|
||||
logger = logging.getLogger('framebuffer')
|
||||
|
||||
match_threshold = 0.95
|
||||
screendump_bgr = cv2.imread(screendump_path, cv2.IMREAD_COLOR)
|
||||
|
|
@ -171,7 +170,7 @@ class MaltaMachineFramebuffer(LinuxKernelTest):
|
|||
h, w = tuxlogo_bgr.shape[:2]
|
||||
debug_png = os.getenv('QEMU_TEST_CV2_SCREENDUMP_PNG_PATH')
|
||||
for tuxlogo_count, pt in enumerate(zip(*loc[::-1]), start=1):
|
||||
logger.debug('found Tux at position (x, y) = %s', pt)
|
||||
self.log.debug('found Tux at position (x, y) = %s', pt)
|
||||
cv2.rectangle(screendump_bgr, pt,
|
||||
(pt[0] + w, pt[1] + h), (0, 0, 255), 2)
|
||||
if debug_png:
|
||||
|
|
|
|||
|
|
@ -32,15 +32,14 @@ class ReplayKernelBase(LinuxKernelTest):
|
|||
# icount requires TCG to be available
|
||||
self.require_accelerator('tcg')
|
||||
|
||||
logger = logging.getLogger('replay')
|
||||
start_time = time.time()
|
||||
vm = self.get_vm(name='recording' if record else 'replay')
|
||||
vm.set_console()
|
||||
if record:
|
||||
logger.info('recording the execution...')
|
||||
self.log.info('recording the execution...')
|
||||
mode = 'record'
|
||||
else:
|
||||
logger.info('replaying the execution...')
|
||||
self.log.info('replaying the execution...')
|
||||
mode = 'replay'
|
||||
vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s' %
|
||||
(shift, mode, replay_path),
|
||||
|
|
@ -54,15 +53,15 @@ class ReplayKernelBase(LinuxKernelTest):
|
|||
self.wait_for_console_pattern(console_pattern, vm)
|
||||
if record:
|
||||
vm.shutdown()
|
||||
logger.info('finished the recording with log size %s bytes'
|
||||
self.log.info('finished the recording with log size %s bytes'
|
||||
% os.path.getsize(replay_path))
|
||||
self.run_replay_dump(replay_path)
|
||||
logger.info('successfully tested replay-dump.py')
|
||||
self.log.info('successfully tested replay-dump.py')
|
||||
else:
|
||||
vm.wait()
|
||||
logger.info('successfully finished the replay')
|
||||
self.log.info('successfully finished the replay')
|
||||
elapsed = time.time() - start_time
|
||||
logger.info('elapsed time %.2f sec' % elapsed)
|
||||
self.log.info('elapsed time %.2f sec' % elapsed)
|
||||
return elapsed
|
||||
|
||||
def run_replay_dump(self, replay_path):
|
||||
|
|
@ -80,5 +79,4 @@ class ReplayKernelBase(LinuxKernelTest):
|
|||
True, shift, args, replay_path)
|
||||
t2 = self.run_vm(kernel_path, kernel_command_line, console_pattern,
|
||||
False, shift, args, replay_path)
|
||||
logger = logging.getLogger('replay')
|
||||
logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
|
||||
self.log.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
|
||||
|
|
|
|||
|
|
@ -121,10 +121,10 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
self._debugcon_log = 'debugcon-log.txt'
|
||||
|
||||
def _print_log(self, log):
|
||||
self.logger.info('\nlogs from biosbits follows:')
|
||||
self.logger.info('==========================================\n')
|
||||
self.logger.info(log)
|
||||
self.logger.info('==========================================\n')
|
||||
self.log.info('\nlogs from biosbits follows:')
|
||||
self.log.info('==========================================\n')
|
||||
self.log.info(log)
|
||||
self.log.info('==========================================\n')
|
||||
|
||||
def copy_bits_config(self):
|
||||
""" copies the bios bits config file into bits.
|
||||
|
|
@ -138,8 +138,8 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
self.assertTrue(os.path.exists(bits_config_file))
|
||||
self.assertTrue(os.path.exists(target_config_dir))
|
||||
shutil.copy2(bits_config_file, target_config_dir)
|
||||
self.logger.info('copied config file %s to %s',
|
||||
bits_config_file, target_config_dir)
|
||||
self.log.info('copied config file %s to %s',
|
||||
bits_config_file, target_config_dir)
|
||||
|
||||
def copy_test_scripts(self):
|
||||
"""copies the python test scripts into bits. """
|
||||
|
|
@ -163,8 +163,8 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
newfilename = os.path.splitext(filename)[0] + '.py'
|
||||
shutil.copy2(os.path.join(bits_test_dir, filename),
|
||||
os.path.join(target_test_dir, newfilename))
|
||||
self.logger.info('copied test file %s to %s',
|
||||
filename, target_test_dir)
|
||||
self.log.info('copied test file %s to %s',
|
||||
filename, target_test_dir)
|
||||
|
||||
# now remove the pyc test file if it exists, otherwise the
|
||||
# changes in the python test script won't be executed.
|
||||
|
|
@ -172,9 +172,9 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
if os.access(os.path.join(target_test_dir, testfile_pyc),
|
||||
os.F_OK):
|
||||
os.remove(os.path.join(target_test_dir, testfile_pyc))
|
||||
self.logger.info('removed compiled file %s',
|
||||
os.path.join(target_test_dir,
|
||||
testfile_pyc))
|
||||
self.log.info('removed compiled file %s',
|
||||
os.path.join(target_test_dir,
|
||||
testfile_pyc))
|
||||
|
||||
def fix_mkrescue(self, mkrescue):
|
||||
""" grub-mkrescue is a bash script with two variables, 'prefix' and
|
||||
|
|
@ -216,7 +216,7 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
|
||||
self.fix_mkrescue(mkrescue_script)
|
||||
|
||||
self.logger.info('using grub-mkrescue for generating biosbits iso ...')
|
||||
self.log.info('using grub-mkrescue for generating biosbits iso ...')
|
||||
|
||||
try:
|
||||
if os.getenv('V') or os.getenv('BITS_DEBUG'):
|
||||
|
|
@ -225,7 +225,7 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
check=True)
|
||||
self.logger.info("grub-mkrescue output %s" % proc.stdout)
|
||||
self.log.info("grub-mkrescue output %s" % proc.stdout)
|
||||
else:
|
||||
subprocess.check_call([mkrescue_script, '-o',
|
||||
iso_file, bits_dir],
|
||||
|
|
@ -238,11 +238,10 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
|
||||
self.assertTrue(os.access(iso_file, os.R_OK))
|
||||
|
||||
self.logger.info('iso file %s successfully generated.', iso_file)
|
||||
self.log.info('iso file %s successfully generated.', iso_file)
|
||||
|
||||
def setUp(self): # pylint: disable=arguments-differ
|
||||
super().setUp()
|
||||
self.logger = self.log
|
||||
|
||||
prebuiltDir = self.scratch_file('prebuilt')
|
||||
if not os.path.isdir(prebuiltDir):
|
||||
|
|
@ -333,7 +332,7 @@ class AcpiBitsTest(QemuSystemTest): #pylint: disable=too-many-instance-attribute
|
|||
# in batch mode and then automatically initiate a vm shutdown.
|
||||
self._vm.event_wait('SHUTDOWN', timeout=BITS_TIMEOUT)
|
||||
self._vm.wait(timeout=None)
|
||||
self.logger.debug("Checking console output ...")
|
||||
self.log.debug("Checking console output ...")
|
||||
self.parse_log()
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue