summaryrefslogtreecommitdiff
path: root/virt-xml
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2019-06-14 12:10:00 -0400
committerCole Robinson <crobinso@redhat.com>2019-06-14 12:37:35 -0400
commitbd7d213cf8cfd68b58759146eee16a5e0b1c17e2 (patch)
treec71a93ad06ddb74832b06e3d13f3aee0895ffd69 /virt-xml
parentfbe388b26ad611c21b4abcad63c0acee8d8988ac (diff)
downloadvirt-manager-bd7d213cf8cfd68b58759146eee16a5e0b1c17e2.tar.gz
virt-xml: Add more test coverage
Diffstat (limited to 'virt-xml')
-rwxr-xr-xvirt-xml14
1 files changed, 5 insertions, 9 deletions
diff --git a/virt-xml b/virt-xml
index a40a202d..3a8cc587 100755
--- a/virt-xml
+++ b/virt-xml
@@ -7,7 +7,6 @@
import difflib
import logging
-import os
import re
import sys
@@ -28,11 +27,7 @@ def prompt_yes_or_no(msg):
printmsg = msg + " (y/n): "
sys.stdout.write(printmsg)
sys.stdout.flush()
-
- if "VIRTINST_TEST_SUITE" in os.environ:
- inp = "yes"
- else:
- inp = sys.stdin.readline().lower().strip()
+ inp = sys.stdin.readline().lower().strip()
if inp in ["y", "yes"]:
return True
@@ -319,8 +314,9 @@ def update_changes(domain, devs, action, confirm):
except libvirt.libvirtError as e:
fail(_("Error attempting device %s: %s") % (action, e))
- print_stdout(_("Device %s successful.") % action)
- if confirm:
+ # Test driver doesn't support device hotplug so we can't reach this
+ print_stdout(_("Device %s successful.") % action) # pragma: no cover
+ if confirm: # pragma: no cover
print_stdout("")
@@ -508,7 +504,7 @@ def main(conn=None):
if dom and options.start:
try:
dom.create()
- except libvirt.libvirtError as e:
+ except libvirt.libvirtError as e: # pragma: no cover
fail(_("Failed starting domain '%s': %s") % (inactive_xmlobj.name, e))
print_stdout(_("Domain '%s' started successfully.") %
inactive_xmlobj.name)