tests/functional/ppc64/pseries: Remove custom migration routine

Don't implement a custom migration routine at PpcMigrationTest and
instead reuse the generic one from MigrationTest.

This removes the dependency of PpcMigrationTest from
PseriesMachine. Having one test import another causes unittest code to
instantiate the imported test, resulting in the setup and teardown
methods being invoked for the imported test class, even if no test
from that class will be executed.

If run in parallel, the extra setup/teardown methods that result from
importing can race with the ones from the actual test being executed
and cause the following error:

File "<SRC_DIR>/tests/functional/qemu_test/testcase.py", line 238, in tearDown
shutil.rmtree(self.workdir)
...
FileNotFoundError: [Errno 2] No such file or directory:
'<SRC_DIR>/build/tests/functional/ppc64/.../test_migration_with_exec/scratch'

The PseriesMachine class is changed to inherit from MigrationTest so
both the migration routines and the class attributes of PseriesMachine
can be accessed without the need to instantiate another object.

Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
Reported-by: Aditya Gupta <adityag@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Tested-by: Aditya Gupta <adityag@linux.ibm.com>
Message-ID: <20260303173320.10942-5-farosas@suse.de>
[thuth: Remove superfluous ";" as suggested by Aditya]
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Fabiano Rosas
2026-03-03 14:33:20 -03:00
committed by Thomas Huth
parent 4a2476634a
commit 502357bbcb
3 changed files with 10 additions and 16 deletions

View File

@@ -65,6 +65,11 @@ def _get_free_port(self, ports):
self.skipTest('Failed to find a free port')
return port
def migration_with_tcp_localhost_vms(self, dst_vm, src_vm):
with Ports() as ports:
uri = 'tcp:localhost:%u' % self._get_free_port(ports)
self.migrate_vms(uri, uri, dst_vm, src_vm)
def migration_with_tcp_localhost(self):
with Ports() as ports:
dst_uri = 'tcp:localhost:%u' % self._get_free_port(ports)

View File

@@ -22,17 +22,6 @@ def test_migration_with_exec(self):
self.set_machine('mac99')
self.migration_with_exec()
def do_migrate_ppc64_linux(self, source_vm, dest_vm):
with Ports() as ports:
port = ports.find_free_port()
if port is None:
self.skipTest('Failed to find a free port')
uri = 'tcp:localhost:%u' % port
dest_vm.qmp('migrate-incoming', uri=uri)
source_vm.qmp('migrate', uri=uri)
self.assert_migration(source_vm, dest_vm)
if __name__ == '__main__':
MigrationTest.main()

View File

@@ -7,11 +7,11 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
from qemu_test import QemuSystemTest, Asset
from qemu_test import Asset
from qemu_test import wait_for_console_pattern
from test_migration import PpcMigrationTest
from migration import MigrationTest
class PseriesMachine(QemuSystemTest):
class PseriesMachine(MigrationTest):
timeout = 90
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
@@ -116,11 +116,11 @@ def test_ppc64_linux_migration(self):
wait_for_console_pattern(self, console_pattern, self.panic_message,
vm=source_vm)
PpcMigrationTest().do_migrate_ppc64_linux(source_vm, dest_vm);
self.migration_with_tcp_localhost_vms(dest_vm, source_vm)
# ensure the boot proceeds after migration
wait_for_console_pattern(self, self.good_message, self.panic_message,
vm=dest_vm)
if __name__ == '__main__':
QemuSystemTest.main()
MigrationTest.main()