[PATCH v2 0/4] tests/functional: Fix ppc64 issue with make -j

[PATCH v2 0/4] tests/functional: Fix ppc64 issue with make -j

[Fabiano Rosas]

As reported in [1], running the ppc64 functional tests in parallel is
currently broken due to one test importing another and causing
unittest.main to instantiate the imported test twice. Fix by removing
the dependency between tests.

1- https://lore.kernel.org/r/aXOGKb88Yho2jb_o@li-3c92a0cc-27cf-11b2-a85c-b804d9ca68fa.ibm.com

CI run: https://gitlab.com/farosas/qemu/-/pipelines/2306044343

v1:
https://lore.kernel.org/r/20260128142829.25326-1-farosas@suse.de

Fabiano Rosas (4):
  tests/functional/migration: Use socket_dir
  tests/functional/migration: Add migrate_vms
  tests/functional/migration: Use the migrate_vms helper
  tests/functional/ppc64: Remove custom migration routine

 tests/functional/migration.py            | 46 ++++++++++++++----------
 tests/functional/ppc64/test_migration.py | 11 ------
 tests/functional/ppc64/test_pseries.py   |  6 ++--
 3 files changed, 32 insertions(+), 31 deletions(-)

-- 
2.51.0

[PATCH v2 1/4] tests/functional/migration: Use socket_dir

[Fabiano Rosas]

Use QemuBaseTest.socket_dir instead of calling tempfile directly so
all tests have consistent directory prefixes.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/functional/migration.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/functional/migration.py b/tests/functional/migration.py
index 2bfb1f7790..0aa873edba 100644
--- a/tests/functional/migration.py
+++ b/tests/functional/migration.py
@@ -11,7 +11,6 @@
 # This work is licensed under the terms of the GNU GPL, version 2 or
 # later.  See the COPYING file in the top-level directory.
 
-import tempfile
 import time
 
 from qemu_test import QemuSystemTest, which
@@ -65,9 +64,8 @@ def migration_with_tcp_localhost(self):
             self.do_migrate(dest_uri)
 
     def migration_with_unix(self):
-        with tempfile.TemporaryDirectory(prefix='socket_') as socket_path:
-            dest_uri = 'unix:%s/qemu-test.sock' % socket_path
-            self.do_migrate(dest_uri)
+        dest_uri = 'unix:%s/migration.sock' % self.socket_dir().name
+        self.do_migrate(dest_uri)
 
     def migration_with_exec(self):
         if not which('ncat'):
-- 
2.51.0

[PATCH v2 2/4] tests/functional/migration: Add migrate_vms

[Fabiano Rosas]

Add a migration helper to MigrationTest that uses the migrate-incoming
QMP commmand and takes the already instantiated VMs. The -incoming
'defer' command line option is preferred way instead of the -incoming
URI syntax that's currently used.

Suggested-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/functional/migration.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/functional/migration.py b/tests/functional/migration.py
index 0aa873edba..3362e5c743 100644
--- a/tests/functional/migration.py
+++ b/tests/functional/migration.py
@@ -40,6 +40,11 @@ def assert_migration(self, src_vm, dst_vm):
         self.assertEqual(dst_vm.cmd('query-status')['status'], 'running')
         self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate')
 
+    def migrate_vms(self, dst_uri, src_uri, dst_vm, src_vm):
+        dst_vm.qmp('migrate-incoming', uri=dst_uri)
+        src_vm.qmp('migrate', uri=src_uri)
+        self.assert_migration(src_vm, dst_vm)
+
     def do_migrate(self, dest_uri, src_uri=None):
         dest_vm = self.get_vm('-incoming', dest_uri, name="dest-qemu")
         dest_vm.add_args('-nodefaults')
-- 
2.51.0

[PATCH v2 3/4] tests/functional/migration: Use the migrate_vms helper

[Fabiano Rosas]

Change do_migrate() to call the migrate_vms() helper and provide it
with the two VMs already created. Rename do_migrate -> migrate and
adjust the callers.

While here, standardize on the "src" and "dst" names.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/functional/migration.py | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/functional/migration.py b/tests/functional/migration.py
index 3362e5c743..49347a30bb 100644
--- a/tests/functional/migration.py
+++ b/tests/functional/migration.py
@@ -45,17 +45,19 @@ def migrate_vms(self, dst_uri, src_uri, dst_vm, src_vm):
         src_vm.qmp('migrate', uri=src_uri)
         self.assert_migration(src_vm, dst_vm)
 
-    def do_migrate(self, dest_uri, src_uri=None):
-        dest_vm = self.get_vm('-incoming', dest_uri, name="dest-qemu")
-        dest_vm.add_args('-nodefaults')
-        dest_vm.launch()
+    def migrate(self, dst_uri, src_uri=None):
+        dst_vm = self.get_vm('-incoming', 'defer', name="dst-qemu")
+        dst_vm.add_args('-nodefaults')
+        dst_vm.launch()
+
+        src_vm = self.get_vm(name="src-qemu")
+        src_vm.add_args('-nodefaults')
+        src_vm.launch()
+
         if src_uri is None:
-            src_uri = dest_uri
-        source_vm = self.get_vm(name="source-qemu")
-        source_vm.add_args('-nodefaults')
-        source_vm.launch()
-        source_vm.qmp('migrate', uri=src_uri)
-        self.assert_migration(source_vm, dest_vm)
+            src_uri = dst_uri
+
+        self.migrate_vms(dst_uri, src_uri, dst_vm, src_vm)
 
     def _get_free_port(self, ports):
         port = ports.find_free_port()
@@ -65,18 +67,18 @@ def _get_free_port(self, ports):
 
     def migration_with_tcp_localhost(self):
         with Ports() as ports:
-            dest_uri = 'tcp:localhost:%u' % self._get_free_port(ports)
-            self.do_migrate(dest_uri)
+            dst_uri = 'tcp:localhost:%u' % self._get_free_port(ports)
+            self.migrate(dst_uri)
 
     def migration_with_unix(self):
-        dest_uri = 'unix:%s/migration.sock' % self.socket_dir().name
-        self.do_migrate(dest_uri)
+        dst_uri = 'unix:%s/migration.sock' % self.socket_dir().name
+        self.migrate(dst_uri)
 
     def migration_with_exec(self):
         if not which('ncat'):
             self.skipTest('ncat is not available')
         with Ports() as ports:
             free_port = self._get_free_port(ports)
-            dest_uri = 'exec:ncat -l localhost %u' % free_port
+            dst_uri = 'exec:ncat -l localhost %u' % free_port
             src_uri = 'exec:ncat localhost %u' % free_port
-            self.do_migrate(dest_uri, src_uri)
+            self.migrate(dst_uri, src_uri)
-- 
2.51.0

[PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Fabiano Rosas]

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'

Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
Reported-by: Aditya Gupta <adityag@linux.ibm.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/functional/migration.py            |  5 +++++
 tests/functional/ppc64/test_migration.py | 11 -----------
 tests/functional/ppc64/test_pseries.py   |  6 ++++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/tests/functional/migration.py b/tests/functional/migration.py
index 49347a30bb..e995328e83 100644
--- a/tests/functional/migration.py
+++ b/tests/functional/migration.py
@@ -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)
diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/ppc64/test_migration.py
index a3b819680b..7d49ee175b 100755
--- a/tests/functional/ppc64/test_migration.py
+++ b/tests/functional/ppc64/test_migration.py
@@ -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()
diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc64/test_pseries.py
index b45763c305..3996a4a878 100755
--- a/tests/functional/ppc64/test_pseries.py
+++ b/tests/functional/ppc64/test_pseries.py
@@ -9,7 +9,7 @@
 
 from qemu_test import QemuSystemTest, Asset
 from qemu_test import wait_for_console_pattern
-from test_migration import PpcMigrationTest
+from migration import MigrationTest
 
 class PseriesMachine(QemuSystemTest):
 
@@ -116,7 +116,9 @@ 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);
+        mt = MigrationTest()
+        mt.timeout = self.timeout
+        mt.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,
-- 
2.51.0

Re: [PATCH v2 2/4] tests/functional/migration: Add migrate_vms

[Peter Xu]

On Wed, Feb 04, 2026 at 02:23:30PM -0300, Fabiano Rosas wrote:
> Add a migration helper to MigrationTest that uses the migrate-incoming
> QMP commmand and takes the already instantiated VMs. The -incoming
> 'defer' command line option is preferred way instead of the -incoming
> URI syntax that's currently used.
> 
> Suggested-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

Re: [PATCH v2 3/4] tests/functional/migration: Use the migrate_vms helper

[Peter Xu]

On Wed, Feb 04, 2026 at 02:23:31PM -0300, Fabiano Rosas wrote:
> Change do_migrate() to call the migrate_vms() helper and provide it
> with the two VMs already created. Rename do_migrate -> migrate and
> adjust the callers.
> 
> While here, standardize on the "src" and "dst" names.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Peter Xu]

On Wed, Feb 04, 2026 at 02:23:32PM -0300, Fabiano Rosas wrote:
> 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'
> 
> Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
> Reported-by: Aditya Gupta <adityag@linux.ibm.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  tests/functional/migration.py            |  5 +++++
>  tests/functional/ppc64/test_migration.py | 11 -----------
>  tests/functional/ppc64/test_pseries.py   |  6 ++++--
>  3 files changed, 9 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
> index 49347a30bb..e995328e83 100644
> --- a/tests/functional/migration.py
> +++ b/tests/functional/migration.py
> @@ -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)
> diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/ppc64/test_migration.py
> index a3b819680b..7d49ee175b 100755
> --- a/tests/functional/ppc64/test_migration.py
> +++ b/tests/functional/ppc64/test_migration.py
> @@ -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()
> diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc64/test_pseries.py
> index b45763c305..3996a4a878 100755
> --- a/tests/functional/ppc64/test_pseries.py
> +++ b/tests/functional/ppc64/test_pseries.py
> @@ -9,7 +9,7 @@
>  
>  from qemu_test import QemuSystemTest, Asset
>  from qemu_test import wait_for_console_pattern
> -from test_migration import PpcMigrationTest
> +from migration import MigrationTest
>  
>  class PseriesMachine(QemuSystemTest):

I wonder if PseriesMachine would be better to inherit directly from
MigrationTest, to avoid the timeout setup and temp QemuSystemTest to be
created on the fly (I'm not familiar with the test framework on side
effects).  But I don't see a major issue with it either so far.

Acked-by: Peter Xu <peterx@redhat.com>

>  
> @@ -116,7 +116,9 @@ 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);
> +        mt = MigrationTest()
> +        mt.timeout = self.timeout
> +        mt.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,
> -- 
> 2.51.0
> 

-- 
Peter Xu

Re: [PATCH v2 1/4] tests/functional/migration: Use socket_dir

[Thomas Huth]

On 04/02/2026 18.23, Fabiano Rosas wrote:
> Use QemuBaseTest.socket_dir instead of calling tempfile directly so
> all tests have consistent directory prefixes.
> 
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>   tests/functional/migration.py | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
> index 2bfb1f7790..0aa873edba 100644
> --- a/tests/functional/migration.py
> +++ b/tests/functional/migration.py
> @@ -11,7 +11,6 @@
>   # This work is licensed under the terms of the GNU GPL, version 2 or
>   # later.  See the COPYING file in the top-level directory.
>   
> -import tempfile
>   import time
>   
>   from qemu_test import QemuSystemTest, which
> @@ -65,9 +64,8 @@ def migration_with_tcp_localhost(self):
>               self.do_migrate(dest_uri)
>   
>       def migration_with_unix(self):
> -        with tempfile.TemporaryDirectory(prefix='socket_') as socket_path:
> -            dest_uri = 'unix:%s/qemu-test.sock' % socket_path
> -            self.do_migrate(dest_uri)
> +        dest_uri = 'unix:%s/migration.sock' % self.socket_dir().name
> +        self.do_migrate(dest_uri)
>   
>       def migration_with_exec(self):
>           if not which('ncat'):

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 2/4] tests/functional/migration: Add migrate_vms

[Thomas Huth]

On 04/02/2026 18.23, Fabiano Rosas wrote:
> Add a migration helper to MigrationTest that uses the migrate-incoming
> QMP commmand and takes the already instantiated VMs. The -incoming
> 'defer' command line option is preferred way instead of the -incoming
> URI syntax that's currently used.
> 
> Suggested-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>   tests/functional/migration.py | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
> index 0aa873edba..3362e5c743 100644
> --- a/tests/functional/migration.py
> +++ b/tests/functional/migration.py
> @@ -40,6 +40,11 @@ def assert_migration(self, src_vm, dst_vm):
>           self.assertEqual(dst_vm.cmd('query-status')['status'], 'running')
>           self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate')
>   
> +    def migrate_vms(self, dst_uri, src_uri, dst_vm, src_vm):
> +        dst_vm.qmp('migrate-incoming', uri=dst_uri)
> +        src_vm.qmp('migrate', uri=src_uri)
> +        self.assert_migration(src_vm, dst_vm)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 3/4] tests/functional/migration: Use the migrate_vms helper

[Thomas Huth]

On 04/02/2026 18.23, Fabiano Rosas wrote:
> Change do_migrate() to call the migrate_vms() helper and provide it
> with the two VMs already created. Rename do_migrate -> migrate and
> adjust the callers.
> 
> While here, standardize on the "src" and "dst" names.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>   tests/functional/migration.py | 34 ++++++++++++++++++----------------
>   1 file changed, 18 insertions(+), 16 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Thomas Huth]

On 04/02/2026 20.51, Peter Xu wrote:
> On Wed, Feb 04, 2026 at 02:23:32PM -0300, Fabiano Rosas wrote:
>> 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'
>>
>> Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
>> Reported-by: Aditya Gupta <adityag@linux.ibm.com>
>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>> ---
>>   tests/functional/migration.py            |  5 +++++
>>   tests/functional/ppc64/test_migration.py | 11 -----------
>>   tests/functional/ppc64/test_pseries.py   |  6 ++++--
>>   3 files changed, 9 insertions(+), 13 deletions(-)
>>
>> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
>> index 49347a30bb..e995328e83 100644
>> --- a/tests/functional/migration.py
>> +++ b/tests/functional/migration.py
>> @@ -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)
>> diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/ppc64/test_migration.py
>> index a3b819680b..7d49ee175b 100755
>> --- a/tests/functional/ppc64/test_migration.py
>> +++ b/tests/functional/ppc64/test_migration.py
>> @@ -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()
>> diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc64/test_pseries.py
>> index b45763c305..3996a4a878 100755
>> --- a/tests/functional/ppc64/test_pseries.py
>> +++ b/tests/functional/ppc64/test_pseries.py
>> @@ -9,7 +9,7 @@
>>   
>>   from qemu_test import QemuSystemTest, Asset
>>   from qemu_test import wait_for_console_pattern
>> -from test_migration import PpcMigrationTest
>> +from migration import MigrationTest
>>   
>>   class PseriesMachine(QemuSystemTest):
> 
> I wonder if PseriesMachine would be better to inherit directly from
> MigrationTest, to avoid the timeout setup and temp QemuSystemTest to be
> created on the fly (I'm not familiar with the test framework on side
> effects).  But I don't see a major issue with it either so far.

I think I'd also prefer to inherit directly from MigrationTest.
You could put the test_ppc64_linux_migration() method into a separate class 
that inherits from MigrationTest, while the other test_* methods stay in the 
old class, so that there is for sure no impact on the other tests.
(Having multiple test classes in one file is fine, we have that in a couple 
of other places already).

  Thomas


>>   
>> @@ -116,7 +116,9 @@ 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);
>> +        mt = MigrationTest()
>> +        mt.timeout = self.timeout
>> +        mt.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,
>> -- 
>> 2.51.0
>>
> 

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Aditya Gupta]

On 04/02/26 22:53, Fabiano Rosas wrote:
> 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'
>
> Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
> Reported-by: Aditya Gupta <adityag@linux.ibm.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>


Tested-by: Aditya Gupta <adityag@linux.ibm.com>

Thank you for fixing the issue Fabiano. Now I don't see any issues 
running the tests in parallel.
- Aditya G

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Aditya Gupta]

Hello all,

Just a ping, the issue still exists with functional tests for ppc64 
failing when run in parallel.

Can we get this merged ?


Thanks,

- Aditya G

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Thomas Huth]

On 25/02/2026 08.23, Aditya Gupta wrote:
> Hello all,
> 
> Just a ping, the issue still exists with functional tests for ppc64 failing 
> when run in parallel.
> 
> Can we get this merged ?

There were suggestions for improvements that were not addressed:

  https://lore.kernel.org/qemu-devel/eedee23c-39dd-4c1a-94e4-d7f1eb0c9d2e@redhat.com/

I don't insist on that change, but I think we should at least have a common 
understanding on whether we want it or not. Fabiano, could you please 
comment on that?

  Thomas

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Fabiano Rosas]

Thomas Huth <thuth@redhat.com> writes:

> On 04/02/2026 20.51, Peter Xu wrote:
>> On Wed, Feb 04, 2026 at 02:23:32PM -0300, Fabiano Rosas wrote:
>>> 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'
>>>
>>> Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
>>> Reported-by: Aditya Gupta <adityag@linux.ibm.com>
>>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>>> ---
>>>   tests/functional/migration.py            |  5 +++++
>>>   tests/functional/ppc64/test_migration.py | 11 -----------
>>>   tests/functional/ppc64/test_pseries.py   |  6 ++++--
>>>   3 files changed, 9 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
>>> index 49347a30bb..e995328e83 100644
>>> --- a/tests/functional/migration.py
>>> +++ b/tests/functional/migration.py
>>> @@ -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)
>>> diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/ppc64/test_migration.py
>>> index a3b819680b..7d49ee175b 100755
>>> --- a/tests/functional/ppc64/test_migration.py
>>> +++ b/tests/functional/ppc64/test_migration.py
>>> @@ -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()
>>> diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc64/test_pseries.py
>>> index b45763c305..3996a4a878 100755
>>> --- a/tests/functional/ppc64/test_pseries.py
>>> +++ b/tests/functional/ppc64/test_pseries.py
>>> @@ -9,7 +9,7 @@
>>>   
>>>   from qemu_test import QemuSystemTest, Asset
>>>   from qemu_test import wait_for_console_pattern
>>> -from test_migration import PpcMigrationTest
>>> +from migration import MigrationTest
>>>   
>>>   class PseriesMachine(QemuSystemTest):
>> 
>> I wonder if PseriesMachine would be better to inherit directly from
>> MigrationTest, to avoid the timeout setup and temp QemuSystemTest to be
>> created on the fly (I'm not familiar with the test framework on side
>> effects).  But I don't see a major issue with it either so far.
>
> I think I'd also prefer to inherit directly from MigrationTest.
> You could put the test_ppc64_linux_migration() method into a separate class 
> that inherits from MigrationTest, while the other test_* methods stay in the 
> old class, so that there is for sure no impact on the other tests.
> (Having multiple test classes in one file is fine, we have that in a couple 
> of other places already).
>

A new class will make it cumbersome to access the class attributes from
PseriesMachine:

    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
    panic_message = 'Kernel panic - not syncing'
    good_message = 'VFS: Cannot open root device'
    ASSET_KERNEL = Asset(...

The "best" way is to make the whole class inherit from MigrationTest. If
you're ok with that I can send a v3.

>   Thomas
>
>
>>>   
>>> @@ -116,7 +116,9 @@ 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);
>>> +        mt = MigrationTest()
>>> +        mt.timeout = self.timeout
>>> +        mt.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,
>>> -- 
>>> 2.51.0
>>>
>> 

Re: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine

[Thomas Huth]

On 25/02/2026 19.20, Fabiano Rosas wrote:
> Thomas Huth <thuth@redhat.com> writes:
> 
>> On 04/02/2026 20.51, Peter Xu wrote:
>>> On Wed, Feb 04, 2026 at 02:23:32PM -0300, Fabiano Rosas wrote:
>>>> 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'
>>>>
>>>> Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pseries")
>>>> Reported-by: Aditya Gupta <adityag@linux.ibm.com>
>>>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>>>> ---
>>>>    tests/functional/migration.py            |  5 +++++
>>>>    tests/functional/ppc64/test_migration.py | 11 -----------
>>>>    tests/functional/ppc64/test_pseries.py   |  6 ++++--
>>>>    3 files changed, 9 insertions(+), 13 deletions(-)
>>>>
>>>> diff --git a/tests/functional/migration.py b/tests/functional/migration.py
>>>> index 49347a30bb..e995328e83 100644
>>>> --- a/tests/functional/migration.py
>>>> +++ b/tests/functional/migration.py
>>>> @@ -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)
>>>> diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/ppc64/test_migration.py
>>>> index a3b819680b..7d49ee175b 100755
>>>> --- a/tests/functional/ppc64/test_migration.py
>>>> +++ b/tests/functional/ppc64/test_migration.py
>>>> @@ -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()
>>>> diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc64/test_pseries.py
>>>> index b45763c305..3996a4a878 100755
>>>> --- a/tests/functional/ppc64/test_pseries.py
>>>> +++ b/tests/functional/ppc64/test_pseries.py
>>>> @@ -9,7 +9,7 @@
>>>>    
>>>>    from qemu_test import QemuSystemTest, Asset
>>>>    from qemu_test import wait_for_console_pattern
>>>> -from test_migration import PpcMigrationTest
>>>> +from migration import MigrationTest
>>>>    
>>>>    class PseriesMachine(QemuSystemTest):
>>>
>>> I wonder if PseriesMachine would be better to inherit directly from
>>> MigrationTest, to avoid the timeout setup and temp QemuSystemTest to be
>>> created on the fly (I'm not familiar with the test framework on side
>>> effects).  But I don't see a major issue with it either so far.
>>
>> I think I'd also prefer to inherit directly from MigrationTest.
>> You could put the test_ppc64_linux_migration() method into a separate class
>> that inherits from MigrationTest, while the other test_* methods stay in the
>> old class, so that there is for sure no impact on the other tests.
>> (Having multiple test classes in one file is fine, we have that in a couple
>> of other places already).
>>
> 
> A new class will make it cumbersome to access the class attributes from
> PseriesMachine:
> 
>      KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
>      panic_message = 'Kernel panic - not syncing'
>      good_message = 'VFS: Cannot open root device'
>      ASSET_KERNEL = Asset(...
> 
> The "best" way is to make the whole class inherit from MigrationTest. If
> you're ok with that I can send a v3.

Fine for me, too!

  Thanks,
   Thomas