diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-23 14:29:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-23 14:29:11 -0500 |
| commit | 645467842339207d895c41f4e4526507b95a636a (patch) | |
| tree | 4a14075cb3661f405d0515007da2459907d4f4db /tests | |
| parent | 1f8bcac09af61e58c5121aa0a932190700ad554d (diff) | |
| parent | 57a33d89672d7c6b1864185652b7cae0747f8323 (diff) | |
| download | qemu-645467842339207d895c41f4e4526507b95a636a.zip qemu-645467842339207d895c41f4e4526507b95a636a.tar.gz qemu-645467842339207d895c41f4e4526507b95a636a.tar.bz2 | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
qapi: g_hash_table_find() instead of GHashTableIter.
qmp: make block job command naming consistent
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/030 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 1faf984..978fd82 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -49,7 +49,7 @@ class TestSingleDrive(ImageStreamingTestCase): def test_stream(self): self.assert_no_active_streams() - result = self.vm.qmp('block_stream', device='drive0') + result = self.vm.qmp('block-stream', device='drive0') self.assert_qmp(result, 'return', {}) completed = False @@ -68,7 +68,7 @@ class TestSingleDrive(ImageStreamingTestCase): 'image file not fully populated after streaming') def test_device_not_found(self): - result = self.vm.qmp('block_stream', device='nonexistent') + result = self.vm.qmp('block-stream', device='nonexistent') self.assert_qmp(result, 'error/class', 'DeviceNotFound') class TestStreamStop(ImageStreamingTestCase): @@ -90,14 +90,14 @@ class TestStreamStop(ImageStreamingTestCase): self.assert_no_active_streams() - result = self.vm.qmp('block_stream', device='drive0') + result = self.vm.qmp('block-stream', device='drive0') self.assert_qmp(result, 'return', {}) time.sleep(1) events = self.vm.get_qmp_events(wait=False) self.assertEqual(events, [], 'unexpected QMP event: %s' % events) - self.vm.qmp('block_job_cancel', device='drive0') + self.vm.qmp('block-job-cancel', device='drive0') self.assert_qmp(result, 'return', {}) cancelled = False @@ -129,10 +129,10 @@ class TestSetSpeed(ImageStreamingTestCase): def perf_test_set_speed(self): self.assert_no_active_streams() - result = self.vm.qmp('block_stream', device='drive0') + result = self.vm.qmp('block-stream', device='drive0') self.assert_qmp(result, 'return', {}) - result = self.vm.qmp('block_job_set_speed', device='drive0', value=8 * 1024 * 1024) + result = self.vm.qmp('block-job-set-speed', device='drive0', value=8 * 1024 * 1024) self.assert_qmp(result, 'return', {}) completed = False |