shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-20 22:50:16 +03:00
Code Issues Projects Releases Wiki Activity

tests: cli: Use regex for grep= and nogrep= args

Browse Source 
This will let us match more complex output, and match error message
differences across libvirt versions

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2024-08-06 10:33:38 -04:00
parent 648f52bde0
commit 0288e92581
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test_cli.py
View File

@ -6,6 +6,7 @@
import atexit
import io
import os
import re
import shlex
import shutil
import sys
@ -348,10 +349,10 @@ class Command(object):
_raise_error("Expected command to %s, but it didn't.\n" %
(self.check_success and "pass" or "fail"))
if self.grep and self.grep not in output:
_raise_error("Didn't find grep=%s" % self.grep)
if self.nogrep and self.nogrep in output:
_raise_error("Found grep=%s when we shouldn't see it" %
if self.grep and not re.search(self.grep, output):
_raise_error("Didn't find regex grep=%s" % self.grep)
if self.nogrep and re.search(self.nogrep, output):
_raise_error("Found regex grep=%s when we shouldn't see it" %
self.nogrep)
if self.compare_file:
@ -961,7 +962,7 @@ c.add_invalid("--disk size=1 --file foobar", grep="Cannot mix --file") # --disk
################################################
c = vinst.add_category("invalid-devices", "--noautoconsole --nodisks --pxe --osinfo require=no")
c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock options: ['foo_tickpolicy']") # Bad suboption
c.add_invalid("--clock foo_tickpolicy=merge", grep="Unknown --clock options:.*'foo_tickpolicy'") # Bad suboption
c.add_invalid("--connect %(URI-TEST-FULL)s --host-device 1d6b:2", grep="corresponds to multiple node devices")
c.add_invalid("--connect %(URI-TEST-FULL)s --host-device pci_8086_2850_scsi_host_scsi_host", grep="Unsupported node device type 'scsi_host'") # Unsupported hostdev type
c.add_invalid("--host-device foobarhostdev", grep="Unknown hostdev address string format") # Unknown hostdev