Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix virt_admin_logouts.positive_test.libvirtd_virt_admin_log_output failure #5292

Merged
merged 1 commit into from
Dec 3, 2023
Merged

Fix virt_admin_logouts.positive_test.libvirtd_virt_admin_log_output failure #5292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libvirt/tests/cfg/daemon/conf_file/libvirtd_conf/virt_admin_logging.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
str_to_grep = "journal"
- libvirtd_virt_admin_log_output:
enable_libvirtd_debug_log = "no"
log_outputs = "3:journald"
log_outputs = "3:journald|3:stderr"
enable_journal_socket = "no"
virt_disk_device_source = "/var/lib/libvirt/images/no_existed_libvirtd.qcow2"
log_file_path = "/var/log/messages"
Expand Down
3 changes: 2 additions & 1 deletion libvirt/tests/src/daemon/conf_file/libvirtd_conf/virt_admin_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import logging
import os
import re

from avocado.utils import process

Expand Down Expand Up @@ -60,7 +61,7 @@ def check_log_outputs(params, test):
log_output = params.get("log_outputs")
vp = virt_admin.VirtadminPersistent()
virt_admin_log = vp.daemon_log_outputs(ignore_status=True, debug=True).stdout_text.strip()
if log_output not in virt_admin_log:
if not re.search(r'%s' % log_output, virt_admin_log):
test.fail("Can not find expected log output: %s from virt admin command output: %s" % (log_output, virt_admin_log))


Expand Down