Am 28.09.2016 um 22:55 hat Max Reitz geschrieben:
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
>  tests/qemu-iotests/iotests.py | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 3329bc1..5a2678f 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -39,6 +39,10 @@ qemu_io_args = [os.environ.get('QEMU_IO_PROG', 'qemu-io')]
>  if os.environ.get('QEMU_IO_OPTIONS'):
>      qemu_io_args += os.environ['QEMU_IO_OPTIONS'].strip().split(' ')
>  
> +qemu_nbd_args = [os.environ.get('QEMU_NBD_PROG', 'qemu-nbd')]
> +if os.environ.get('QEMU_NBD_OPTIONS'):
> +    qemu_nbd_args += os.environ['QEMU_NBD_OPTIONS'].strip().split(' ')
> +
>  qemu_prog = os.environ.get('QEMU_PROG', 'qemu')
>  qemu_opts = os.environ.get('QEMU_OPTIONS', '').strip().split(' ')
>  
> @@ -87,6 +91,10 @@ def qemu_io(*args):
>          sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' 
> '.join(args)))
>      return subp.communicate()[0]
>  
> +def qemu_nbd(*args):
> +    '''Run qemu-nbd in daemon mode and return the parent's exit code'''
> +    return subprocess.call(qemu_nbd_args + ['--fork'] + list(args))

Wouldn't it be better to always use -t, track the PID and shut it down
explicitly when the test exits?

The way you're using qemu-nbd here is fine if the test case passes, but
if it fails before we access the NBD server, the server keeps running in
the background.

Kevin

Reply via email to