| Message ID | 20200206130812.612960-1-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests/147: Fix drive parameters | expand |
On 2/6/20 7:08 AM, Max Reitz wrote: > 8dff69b94 added an aio parameter to the drive parameter but forgot to > add a comma before, thus breaking the test. Fix it again. > > Fixes: 8dff69b9415b4287e900358744b732195e1ab2e2 > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/147 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Aha - that's what my bisect just landed on. And what's worse, the breakage leaves behind orphaned qemu processes (four per failed test). Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Eric Blake <eblake@redhat.com> (I would have included it in my NBD pull request, except I sent that just minutes before this email arrived, and I'm not sure when my next pull request will be...) > > diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 > index 2b6f859a09..30782b8924 100755 > --- a/tests/qemu-iotests/147 > +++ b/tests/qemu-iotests/147 > @@ -134,7 +134,7 @@ class BuiltinNBD(NBDBlockdevAddBase): > self.server.add_drive_raw('if=none,id=nbd-export,' + > 'file=%s,' % test_img + > 'format=%s,' % imgfmt + > - 'cache=%s' % cachemode + > + 'cache=%s,' % cachemode + > 'aio=%s' % aiomode) > self.server.launch() > >
On 06.02.20 14:08, Max Reitz wrote: > 8dff69b94 added an aio parameter to the drive parameter but forgot to > add a comma before, thus breaking the test. Fix it again. > > Fixes: 8dff69b9415b4287e900358744b732195e1ab2e2 > Signed-off-by: Max Reitz <mreitz@redhat.com> Applied to my block branch. Max
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 2b6f859a09..30782b8924 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -134,7 +134,7 @@ class BuiltinNBD(NBDBlockdevAddBase): self.server.add_drive_raw('if=none,id=nbd-export,' + 'file=%s,' % test_img + 'format=%s,' % imgfmt + - 'cache=%s' % cachemode + + 'cache=%s,' % cachemode + 'aio=%s' % aiomode) self.server.launch()
8dff69b94 added an aio parameter to the drive parameter but forgot to add a comma before, thus breaking the test. Fix it again. Fixes: 8dff69b9415b4287e900358744b732195e1ab2e2 Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/147 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)