diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 17:07:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 17:07:24 +0000 |
| commit | 8f280309030331a912fd8924c129d8bd59e1bdc7 (patch) | |
| tree | 782e835f9f3cc152c3a868746108df551e38f62a /tests | |
| parent | 7199c89d8c6bbd0eda2cadb0d3fc7149934202bf (diff) | |
| parent | ca4fa82fe66076284f702adcfe7c319ebbf909ec (diff) | |
| download | qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.zip qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.tar.gz qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 18 Nov 2015 15:28:32 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: Call external_snapshot_clean after blockdev-snapshot
blockdev: Add missing bdrv_unref() in drive-backup
iotests: fix race in 030
nand: fix address overflow
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/030 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 952a524..32469ef 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -245,6 +245,7 @@ class TestEIO(TestErrors): while not completed: for event in self.vm.get_qmp_events(wait=True): if event['event'] == 'BLOCK_JOB_ERROR': + error = True self.assert_qmp(event, 'data/device', 'drive0') self.assert_qmp(event, 'data/operation', 'read') @@ -257,9 +258,11 @@ class TestEIO(TestErrors): self.assert_qmp(result, 'return', {}) result = self.vm.qmp('query-block-jobs') + if result == {'return': []}: + # Race; likely already finished. Check. + continue self.assert_qmp(result, 'return[0]/paused', False) self.assert_qmp(result, 'return[0]/io-status', 'ok') - error = True elif event['event'] == 'BLOCK_JOB_COMPLETED': self.assertTrue(error, 'job completed unexpectedly') self.assert_qmp(event, 'data/type', 'stream') |