iotests: Adjust fuse-allow-other expected output

[PATCH] iotests: Adjust fuse-allow-other expected output

Posted by Eric Blake 3 weeks, 2 days ago

The iotest fuse-allow-other has been broken since commit effd60c8 in
v9.0.0; but as Dan Berrange's efforts to improve CI have proven, we
haven't been reliably running it to notice.  The change in that commit
was good (moving coroutine commands to run in the right context), but
it meant that "execute":"quit" now waits to complete until the
coroutines tearing down fuse have first reported the SHUTDOWN event,
in the opposite order of what happened pre-patch.

Signed-off-by: Eric Blake <eblake@redhat.com>
Fixes: effd60c8 ("monitor: only run coroutine commands in qemu_aio_context",
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/qemu-iotests/tests/fuse-allow-other.out | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/tests/fuse-allow-other.out b/tests/qemu-iotests/tests/fuse-allow-other.out
index 543fa52a063..3219fc35e05 100644
--- a/tests/qemu-iotests/tests/fuse-allow-other.out
+++ b/tests/qemu-iotests/tests/fuse-allow-other.out
@@ -28,9 +28,9 @@ stat: cannot statx 'fuse-export': Permission denied
 cat: fuse-export: Permission denied
 stat: cannot statx 'fuse-export': Permission denied
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}

 --- allow-other=on ---
 {'execute': 'qmp_capabilities'}
@@ -55,9 +55,9 @@ Permissions seen by nobody: 444
 cat: fuse-export: Permission denied
 Permissions seen by nobody: 440
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}

 --- allow-other=auto ---
 {'execute': 'qmp_capabilities'}
@@ -82,7 +82,7 @@ Permissions seen by nobody: 444
 cat: fuse-export: Permission denied
 Permissions seen by nobody: 440
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}
 *** done
-- 
2.51.0

Re: [PATCH] iotests: Adjust fuse-allow-other expected output

Posted by Kevin Wolf 3 weeks ago

Am 21.10.2025 um 22:58 hat Eric Blake geschrieben:
> The iotest fuse-allow-other has been broken since commit effd60c8 in
> v9.0.0; but as Dan Berrange's efforts to improve CI have proven, we
> haven't been reliably running it to notice.  The change in that commit
> was good (moving coroutine commands to run in the right context), but
> it meant that "execute":"quit" now waits to complete until the
> coroutines tearing down fuse have first reported the SHUTDOWN event,
> in the opposite order of what happened pre-patch.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> Fixes: effd60c8 ("monitor: only run coroutine commands in qemu_aio_context",
> Reported-by: Daniel P. Berrangé <berrange@redhat.com>

Thanks, applied to the block branch.

Kevin

Re: [PATCH] iotests: Adjust fuse-allow-other expected output

Posted by Daniel P. Berrangé 3 weeks, 2 days ago

On Tue, Oct 21, 2025 at 03:58:40PM -0500, Eric Blake wrote:
> The iotest fuse-allow-other has been broken since commit effd60c8 in
> v9.0.0; but as Dan Berrange's efforts to improve CI have proven, we
> haven't been reliably running it to notice.  The change in that commit
> was good (moving coroutine commands to run in the right context), but
> it meant that "execute":"quit" now waits to complete until the
> coroutines tearing down fuse have first reported the SHUTDOWN event,
> in the opposite order of what happened pre-patch.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> Fixes: effd60c8 ("monitor: only run coroutine commands in qemu_aio_context",
> Reported-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  tests/qemu-iotests/tests/fuse-allow-other.out | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|