diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
| commit | fdef621b5810cf8d6715e04d883a0f3523873014 (patch) | |
| tree | e6979f169764792f0ebd75596dd90f454aca4510 /tests | |
| parent | cc92186773df8c9aae8f812fff85e7325e1d7583 (diff) | |
| parent | 58c8cce21c13bddd332590fb1fd9a5c369975d3f (diff) | |
| download | qemu-fdef621b5810cf8d6715e04d883a0f3523873014.zip qemu-fdef621b5810cf8d6715e04d883a0f3523873014.tar.gz qemu-fdef621b5810cf8d6715e04d883a0f3523873014.tar.bz2 | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
qemu-iotests: Fix 030 after switch to GenericError
block: Flush parent to OS with cache=unsafe
iscsi: Fix NULL dereferences / races between task completion and abort
monitor: Clean up fd sets on monitor disconnect
block: Enable qemu_open/close to work with fd sets
block: Convert close calls to qemu_close
block: Convert open calls to qemu_open
block: Prevent detection of /dev/fdset/ as floppy
qapi: Introduce add-fd, remove-fd, query-fdsets
qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/030 | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/Makefile b/tests/Makefile index f3f4159..26a67ce 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,7 +81,7 @@ TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),)) check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) -qtest-obj-y = tests/libqtest.o $(oslib-obj-y) +qtest-obj-y = tests/libqtest.o $(oslib-obj-y) $(tools-obj-y) $(check-qtest-y): $(qtest-obj-y) .PHONY: check-help diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index cc671dd..f71ab8d 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -225,8 +225,7 @@ class TestSetSpeed(ImageStreamingTestCase): self.assert_no_active_streams() result = self.vm.qmp('block-stream', device='drive0', speed=-1) - self.assert_qmp(result, 'error/class', 'InvalidParameter') - self.assert_qmp(result, 'error/data/name', 'speed') + self.assert_qmp(result, 'error/class', 'GenericError') self.assert_no_active_streams() @@ -234,8 +233,7 @@ class TestSetSpeed(ImageStreamingTestCase): self.assert_qmp(result, 'return', {}) result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1) - self.assert_qmp(result, 'error/class', 'InvalidParameter') - self.assert_qmp(result, 'error/data/name', 'speed') + self.assert_qmp(result, 'error/class', 'GenericError') self.cancel_and_wait() |