We need to import things from the qemu namespace; importing the
namespace alone doesn't bring the submodules with it -- unless someone
else (like iotests.py) imports them too.

Adjust the imports.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms
index 2fc8dd66e0..de18182590 100755
--- a/tests/qemu-iotests/tests/mirror-top-perms
+++ b/tests/qemu-iotests/tests/mirror-top-perms
@@ -25,7 +25,8 @@ from iotests import qemu_img
 
 # Import qemu after iotests.py has amended sys.path
 # pylint: disable=wrong-import-order
-import qemu
+from qemu import qmp
+from qemu.machine import machine
 
 
 image_size = 1 * 1024 * 1024
@@ -47,7 +48,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
     def tearDown(self):
         try:
             self.vm.shutdown()
-        except qemu.machine.machine.AbnormalShutdown:
+        except machine.AbnormalShutdown:
             pass
 
         if self.vm_b is not None:
@@ -102,7 +103,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
             self.vm_b.launch()
             print('ERROR: VM B launched successfully, this should not have '
                   'happened')
-        except qemu.qmp.QMPConnectError:
+        except qmp.QMPConnectError:
             assert 'Is another process using the image' in self.vm_b.get_log()
 
         result = self.vm.qmp('block-job-cancel',
-- 
2.31.1

On 9/16/21 6:09 AM, John Snow wrote:
> We need to import things from the qemu namespace; importing the
> namespace alone doesn't bring the submodules with it -- unless someone
> else (like iotests.py) imports them too.
> 
> Adjust the imports.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms
> index 2fc8dd66e0..de18182590 100755
> --- a/tests/qemu-iotests/tests/mirror-top-perms
> +++ b/tests/qemu-iotests/tests/mirror-top-perms
> @@ -25,7 +25,8 @@ from iotests import qemu_img
>  
>  # Import qemu after iotests.py has amended sys.path
>  # pylint: disable=wrong-import-order
> -import qemu
> +from qemu import qmp
> +from qemu.machine import machine

Not straight-forward import name...

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

On Thu, Sep 16, 2021 at 12:27 AM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:

> On 9/16/21 6:09 AM, John Snow wrote:
> > We need to import things from the qemu namespace; importing the
> > namespace alone doesn't bring the submodules with it -- unless someone
> > else (like iotests.py) imports them too.
> >
> > Adjust the imports.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
> > ---
> >  tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/tests/qemu-iotests/tests/mirror-top-perms
> b/tests/qemu-iotests/tests/mirror-top-perms
> > index 2fc8dd66e0..de18182590 100755
> > --- a/tests/qemu-iotests/tests/mirror-top-perms
> > +++ b/tests/qemu-iotests/tests/mirror-top-perms
> > @@ -25,7 +25,8 @@ from iotests import qemu_img
> >
> >  # Import qemu after iotests.py has amended sys.path
> >  # pylint: disable=wrong-import-order
> > -import qemu
> > +from qemu import qmp
> > +from qemu.machine import machine
>
> Not straight-forward import name...
>
>
You mean the 'qemu.machine.machine' path? If so, I agree. It will be fixed
when I refactor QEMUMachine. A/QMP happens first.


> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>

On 9/16/21 4:27 PM, John Snow wrote:
> On Thu, Sep 16, 2021 at 12:27 AM Philippe Mathieu-Daudé
> <philmd@redhat.com <mailto:philmd@redhat.com>> wrote:
> 
>     On 9/16/21 6:09 AM, John Snow wrote:
>     > We need to import things from the qemu namespace; importing the
>     > namespace alone doesn't bring the submodules with it -- unless someone
>     > else (like iotests.py) imports them too.
>     >
>     > Adjust the imports.
>     >
>     > Signed-off-by: John Snow <jsnow@redhat.com <mailto:jsnow@redhat.com>>
>     > ---
>     >  tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
>     >  1 file changed, 4 insertions(+), 3 deletions(-)
>     >
>     > diff --git a/tests/qemu-iotests/tests/mirror-top-perms
>     b/tests/qemu-iotests/tests/mirror-top-perms
>     > index 2fc8dd66e0..de18182590 100755
>     > --- a/tests/qemu-iotests/tests/mirror-top-perms
>     > +++ b/tests/qemu-iotests/tests/mirror-top-perms
>     > @@ -25,7 +25,8 @@ from iotests import qemu_img
>     > 
>     >  # Import qemu after iotests.py has amended sys.path
>     >  # pylint: disable=wrong-import-order
>     > -import qemu
>     > +from qemu import qmp
>     > +from qemu.machine import machine
> 
>     Not straight-forward import name...
> 
> 
> You mean the 'qemu.machine.machine' path? If so, I agree. It will be
> fixed when I refactor QEMUMachine. A/QMP happens first.

Good news!

On 16.09.21 06:09, John Snow wrote:
> We need to import things from the qemu namespace; importing the
> namespace alone doesn't bring the submodules with it -- unless someone
> else (like iotests.py) imports them too.
>
> Adjust the imports.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Hanna Reitz <hreitz@redhat.com>