diff options
| author | John Snow <jsnow@redhat.com> | 2021-10-26 13:56:05 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2021-11-01 11:54:59 -0400 |
| commit | b9420e4f4b899c96221fa5a1f7f025214e756c50 (patch) | |
| tree | bf744d81f87511a55c776f29e94ac89e4525a28b /tests/qemu-iotests/040 | |
| parent | 461044ceb4fe58eb919dedfeb62f619f79d4d552 (diff) | |
| download | qemu-b9420e4f4b899c96221fa5a1f7f025214e756c50.zip qemu-b9420e4f4b899c96221fa5a1f7f025214e756c50.tar.gz qemu-b9420e4f4b899c96221fa5a1f7f025214e756c50.tar.bz2 | |
python/machine: remove has_quit argument
If we spy on the QMP commands instead, we don't need callers to remember
to pass it. Seems like a fair trade-off.
The one slightly weird bit is overloading this instance variable for
wait(), where we use it to mean "don't issue the qmp 'quit'
command". This means that wait() will "fail" if the QEMU process does
not terminate of its own accord.
In most cases, we probably did already actually issue quit -- some
iotests do this -- but in some others, we may be waiting for QEMU to
terminate for some other reason, such as a test wherein we tell the
guest (directly) to shut down.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20211026175612.4127598-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/040')
| -rwxr-xr-x | tests/qemu-iotests/040 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index f3677de..6af5ab9 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -92,10 +92,9 @@ class TestSingleDrive(ImageCommitTestCase): self.vm.add_device('virtio-scsi') self.vm.add_device("scsi-hd,id=scsi0,drive=drive0") self.vm.launch() - self.has_quit = False def tearDown(self): - self.vm.shutdown(has_quit=self.has_quit) + self.vm.shutdown() os.remove(test_img) os.remove(mid_img) os.remove(backing_img) @@ -127,8 +126,6 @@ class TestSingleDrive(ImageCommitTestCase): result = self.vm.qmp('quit') self.assert_qmp(result, 'return', {}) - self.has_quit = True - # Same as above, but this time we add the filter after starting the job @iotests.skip_if_unsupported(['throttle']) def test_commit_plus_filter_and_quit(self): @@ -147,8 +144,6 @@ class TestSingleDrive(ImageCommitTestCase): result = self.vm.qmp('quit') self.assert_qmp(result, 'return', {}) - self.has_quit = True - def test_device_not_found(self): result = self.vm.qmp('block-commit', device='nonexistent', top='%s' % mid_img) self.assert_qmp(result, 'error/class', 'DeviceNotFound') |