Skip to content

Commit

Permalink
Merge remote-tracking branch 'ldoktor/avoid-hang'
Browse files Browse the repository at this point in the history
Signed-off-by: Cleber Rosa <[email protected]>
  • Loading branch information
clebergnu committed Oct 23, 2017
2 parents af4b8a7 + af804a5 commit 8408a28
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion virttest/qemu_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,10 @@ def __getinitargs__(self):
# dependency by creating fake VM object which only contains `vm.name`,
# which is in reality the only information required by Monitor object
# at this time.
return VM(self.vm.name), self.name, self.filename, False
# Always ignore errors during unpickle as exceptions during "__init__"
# would cause the whole unpickle operation to fail, leaving us without
# any representation whatsoever.
return VM(self.vm.name), self.name, self.filename, True

def _close_sock(self):
try:
Expand Down
5 changes: 4 additions & 1 deletion virttest/virt_vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,10 @@ def verify_dmesg(self, dmesg_log_file=None):
"""
Verify guest dmesg
"""
session = self.wait_for_login()
if len(self.virtnet) > 0:
session = self.wait_for_login()
else:
session = self.wait_for_serial_login()
level = self.params.get("guest_dmesg_level", 3)
ignore_result = self.params.get("guest_dmesg_ignore", "no") == "yes"
utils_misc.verify_dmesg(dmesg_log_file=dmesg_log_file,
Expand Down

0 comments on commit 8408a28

Please sign in to comment.