diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-16 14:36:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-16 14:36:16 +0100 |
| commit | 5ee53d1593dfc071275b13b1228c70bb88f4aaee (patch) | |
| tree | 1e58882bef9497fe270f52417759fad69884162a /scripts/qtest.py | |
| parent | d8782a113a5f21a030b35fc35f0871b937685227 (diff) | |
| parent | b92a0011b1220aff549ae82c6104014d25e339ef (diff) | |
| download | focaccia-qemu-5ee53d1593dfc071275b13b1228c70bb88f4aaee.tar.gz focaccia-qemu-5ee53d1593dfc071275b13b1228c70bb88f4aaee.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2017-09-15 # gpg: Signature made Sat 16 Sep 2017 00:14:01 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: qemu.py: include debug information on launch error qemu.py: improve message on negative exit code qemu.py: use os.path.null instead of /dev/null qemu.py: avoid writing to stdout/stderr qemu.py: fix is_running() return before first launch() qtest.py: Few pylint/style fixes qmp.py: Avoid overriding a builtin object qmp.py: Avoid "has_key" usage qmp.py: Use object-based class for QEMUMonitorProtocol qmp.py: Couple of pylint/style fixes qemu.py: Use custom exceptions rather than Exception qemu.py: Simplify QMP key-conversion qemu.py: Use iteritems rather than keys() qemu|qtest: Avoid dangerous arguments qemu.py: Pylint/style fixes Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qtest.py')
| -rw-r--r-- | scripts/qtest.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/qtest.py b/scripts/qtest.py index d5aecb5f49..df0daf26ca 100644 --- a/scripts/qtest.py +++ b/scripts/qtest.py @@ -11,14 +11,11 @@ # Based on qmp.py. # -import errno import socket -import string import os -import subprocess -import qmp.qmp import qemu + class QEMUQtestProtocol(object): def __init__(self, address, server=False): """ @@ -79,12 +76,14 @@ class QEMUQtestProtocol(object): class QEMUQtestMachine(qemu.QEMUMachine): '''A QEMU VM''' - def __init__(self, binary, args=[], name=None, test_dir="/var/tmp", + def __init__(self, binary, args=None, name=None, test_dir="/var/tmp", socket_scm_helper=None): if name is None: name = "qemu-%d" % os.getpid() - super(QEMUQtestMachine, self).__init__(binary, args, name=name, test_dir=test_dir, - socket_scm_helper=socket_scm_helper) + super(QEMUQtestMachine, + self).__init__(binary, args, name=name, test_dir=test_dir, + socket_scm_helper=socket_scm_helper) + self._qtest = None self._qtest_path = os.path.join(test_dir, name + "-qtest.sock") def _base_args(self): |