diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-01 14:34:15 -0400 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-01 14:34:15 -0400 |
| commit | 4b0bf11c5a4fc6f2dd8cff650dfd4a2c52026396 (patch) | |
| tree | da386d95c9eecacc1c2f42cc6d5cc428959ad66c /scripts | |
| parent | af531756d25541a1b3b3d9a14e72e7fedd941a2e (diff) | |
| parent | 76cd358671e6b8e7c435ec65b1c44200254514a9 (diff) | |
| download | focaccia-qemu-4b0bf11c5a4fc6f2dd8cff650dfd4a2c52026396.tar.gz focaccia-qemu-4b0bf11c5a4fc6f2dd8cff650dfd4a2c52026396.zip | |
Merge remote-tracking branch 'remotes/jsnow/tags/python-pull-request' into staging
Pull request # gpg: Signature made Mon 01 Nov 2021 01:29:49 PM EDT # gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full] * remotes/jsnow/tags/python-pull-request: (22 commits) python, iotests: replace qmp with aqmp python/aqmp: Create sync QMP wrapper for iotests iotests/300: avoid abnormal shutdown race condition iotests: Conditionally silence certain AQMP errors iotests: Accommodate async QMP Exception classes python/aqmp: Remove scary message python/machine: Handle QMP errors on close more meticulously python/machine: remove has_quit argument python: Add iotest linters to test suite iotests/linters: Add workaround for mypy bug #9852 iotests/linters: Add entry point for linting via Python CI iotests: split linters.py out from 297 iotests/297: split test into sub-cases iotests/297: update tool availability checks iotests/297: Change run_linter() to raise an exception on failure iotests/297: refactor run_[mypy|pylint] as generic execution shim iotests/297: Split run_linters apart into run_pylint and run_mypy iotests/297: Don't rely on distro-specific linter binaries iotests/297: Create main() function iotests/297: Add get_files() function ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/simplebench/bench_block_job.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py index 4f03c12169..a403c35b08 100755 --- a/scripts/simplebench/bench_block_job.py +++ b/scripts/simplebench/bench_block_job.py @@ -28,6 +28,7 @@ import json sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu.machine import QEMUMachine from qemu.qmp import QMPConnectError +from qemu.aqmp import ConnectError def bench_block_job(cmd, cmd_args, qemu_args): @@ -49,7 +50,7 @@ def bench_block_job(cmd, cmd_args, qemu_args): vm.launch() except OSError as e: return {'error': 'popen failed: ' + str(e)} - except (QMPConnectError, socket.timeout): + except (QMPConnectError, ConnectError, socket.timeout): return {'error': 'qemu failed: ' + str(vm.get_log())} try: |