iotests/041: Drop superfluous shutdowns
All tearDowns in 041 shutdown the VM. Thus, test cases do not need to do it themselves (unless they need the VM to be down for some post-operation check). Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20200218103454.296704-16-mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
6a3d0f1e3f
commit
5d016a69e3
|
@ -80,7 +80,6 @@ class TestSingleDrive(iotests.QMPTestCase):
|
||||||
self.cancel_and_wait(force=True)
|
self.cancel_and_wait(force=True)
|
||||||
result = self.vm.qmp('query-block')
|
result = self.vm.qmp('query-block')
|
||||||
self.assert_qmp(result, 'return[0]/inserted/file', test_img)
|
self.assert_qmp(result, 'return[0]/inserted/file', test_img)
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_cancel_after_ready(self):
|
def test_cancel_after_ready(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -201,8 +200,6 @@ class TestSingleDrive(iotests.QMPTestCase):
|
||||||
self.assert_qmp(result, 'return[0]/node-name', 'top')
|
self.assert_qmp(result, 'return[0]/node-name', 'top')
|
||||||
self.assert_qmp(result, 'return[0]/backing/node-name', 'base')
|
self.assert_qmp(result, 'return[0]/backing/node-name', 'base')
|
||||||
|
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_medium_not_found(self):
|
def test_medium_not_found(self):
|
||||||
if iotests.qemu_default_machine != 'pc':
|
if iotests.qemu_default_machine != 'pc':
|
||||||
return
|
return
|
||||||
|
@ -455,7 +452,6 @@ new_state = "1"
|
||||||
self.assert_qmp(event, 'data/id', 'drive0')
|
self.assert_qmp(event, 'data/id', 'drive0')
|
||||||
|
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_ignore_read(self):
|
def test_ignore_read(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -475,7 +471,6 @@ new_state = "1"
|
||||||
result = self.vm.qmp('query-block-jobs')
|
result = self.vm.qmp('query-block-jobs')
|
||||||
self.assert_qmp(result, 'return[0]/paused', False)
|
self.assert_qmp(result, 'return[0]/paused', False)
|
||||||
self.complete_and_wait()
|
self.complete_and_wait()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_large_cluster(self):
|
def test_large_cluster(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -540,7 +535,6 @@ new_state = "1"
|
||||||
|
|
||||||
self.complete_and_wait(wait_ready=False)
|
self.complete_and_wait(wait_ready=False)
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
class TestWriteErrors(iotests.QMPTestCase):
|
class TestWriteErrors(iotests.QMPTestCase):
|
||||||
image_len = 2 * 1024 * 1024 # MB
|
image_len = 2 * 1024 * 1024 # MB
|
||||||
|
@ -614,7 +608,6 @@ new_state = "1"
|
||||||
completed = True
|
completed = True
|
||||||
|
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_ignore_write(self):
|
def test_ignore_write(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -631,7 +624,6 @@ new_state = "1"
|
||||||
result = self.vm.qmp('query-block-jobs')
|
result = self.vm.qmp('query-block-jobs')
|
||||||
self.assert_qmp(result, 'return[0]/paused', False)
|
self.assert_qmp(result, 'return[0]/paused', False)
|
||||||
self.complete_and_wait()
|
self.complete_and_wait()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_stop_write(self):
|
def test_stop_write(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -667,7 +659,6 @@ new_state = "1"
|
||||||
|
|
||||||
self.complete_and_wait(wait_ready=False)
|
self.complete_and_wait(wait_ready=False)
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
class TestSetSpeed(iotests.QMPTestCase):
|
class TestSetSpeed(iotests.QMPTestCase):
|
||||||
image_len = 80 * 1024 * 1024 # MB
|
image_len = 80 * 1024 * 1024 # MB
|
||||||
|
@ -936,7 +927,6 @@ class TestRepairQuorum(iotests.QMPTestCase):
|
||||||
# here we check that the last registered quorum file has not been
|
# here we check that the last registered quorum file has not been
|
||||||
# swapped out and unref
|
# swapped out and unref
|
||||||
self.assert_has_block_node(None, quorum_img3)
|
self.assert_has_block_node(None, quorum_img3)
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
def test_cancel_after_ready(self):
|
def test_cancel_after_ready(self):
|
||||||
self.assert_no_active_block_jobs()
|
self.assert_no_active_block_jobs()
|
||||||
|
@ -1043,7 +1033,6 @@ class TestRepairQuorum(iotests.QMPTestCase):
|
||||||
self.assert_has_block_node("repair0", quorum_repair_img)
|
self.assert_has_block_node("repair0", quorum_repair_img)
|
||||||
# TODO: a better test requiring some QEMU infrastructure will be added
|
# TODO: a better test requiring some QEMU infrastructure will be added
|
||||||
# to check that this file is really driven by quorum
|
# to check that this file is really driven by quorum
|
||||||
self.vm.shutdown()
|
|
||||||
|
|
||||||
# Test mirroring with a source that does not have any parents (not even a
|
# Test mirroring with a source that does not have any parents (not even a
|
||||||
# BlockBackend)
|
# BlockBackend)
|
||||||
|
|
Loading…
Reference in a new issue