| Message ID | 20190220145819.30969-2-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix NBD TLS iotests on RHEL-7 | expand |
On 20.02.19 15:58, Daniel P. Berrangé wrote: > If we abort the iotest early the server.log file might contain useful > information for diagnosing the problem. Ensure its contents are > displayed in this case. > > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > tests/qemu-iotests/233 | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 > index fc345a1a46..27932df075 100755 > --- a/tests/qemu-iotests/233 > +++ b/tests/qemu-iotests/233 > @@ -30,6 +30,8 @@ _cleanup() > { > nbd_server_stop > _cleanup_test_img > + # If we aborted early we want to see this log for diagnosis > + test -f "$TEST_DIR/server.log" && cat "$TEST_DIR/server.log" > rm -f "$TEST_DIR/server.log" > tls_x509_cleanup > } > @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io > echo > echo "== final server log ==" > cat "$TEST_DIR/server.log" > +rm -f $TEST_DIR/server.log I'm not sure how well the iotests currently cope with spaced dir names anyway, but it looks weird to not use quotes here right after a line that does. Max > > # success, all done > echo "*** done" >
On Fri, Feb 22, 2019 at 04:06:32PM +0100, Max Reitz wrote: > On 20.02.19 15:58, Daniel P. Berrangé wrote: > > If we abort the iotest early the server.log file might contain useful > > information for diagnosing the problem. Ensure its contents are > > displayed in this case. > > > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > > --- > > tests/qemu-iotests/233 | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 > > index fc345a1a46..27932df075 100755 > > --- a/tests/qemu-iotests/233 > > +++ b/tests/qemu-iotests/233 > > @@ -30,6 +30,8 @@ _cleanup() > > { > > nbd_server_stop > > _cleanup_test_img > > + # If we aborted early we want to see this log for diagnosis > > + test -f "$TEST_DIR/server.log" && cat "$TEST_DIR/server.log" > > rm -f "$TEST_DIR/server.log" > > tls_x509_cleanup > > } > > @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io > > echo > > echo "== final server log ==" > > cat "$TEST_DIR/server.log" > > +rm -f $TEST_DIR/server.log > > I'm not sure how well the iotests currently cope with spaced dir names > anyway, but it looks weird to not use quotes here right after a line > that does. Yes, that is a mistake since we tried quoting throughout the file Regards, Daniel
On 2/22/19 9:16 AM, Daniel P. Berrangé wrote: > On Fri, Feb 22, 2019 at 04:06:32PM +0100, Max Reitz wrote: >> On 20.02.19 15:58, Daniel P. Berrangé wrote: >>> If we abort the iotest early the server.log file might contain useful >>> information for diagnosing the problem. Ensure its contents are >>> displayed in this case. >>> >>> Reviewed-by: Eric Blake <eblake@redhat.com> >>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> >>> @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io >>> echo >>> echo "== final server log ==" >>> cat "$TEST_DIR/server.log" >>> +rm -f $TEST_DIR/server.log >> >> I'm not sure how well the iotests currently cope with spaced dir names >> anyway, but it looks weird to not use quotes here right after a line >> that does. > > Yes, that is a mistake since we tried quoting throughout the file Can fix that while staging through my NBD queue. I'll probably send a PR on Monday.
On 22.02.19 16:54, Eric Blake wrote: > On 2/22/19 9:16 AM, Daniel P. Berrangé wrote: >> On Fri, Feb 22, 2019 at 04:06:32PM +0100, Max Reitz wrote: >>> On 20.02.19 15:58, Daniel P. Berrangé wrote: >>>> If we abort the iotest early the server.log file might contain useful >>>> information for diagnosing the problem. Ensure its contents are >>>> displayed in this case. >>>> >>>> Reviewed-by: Eric Blake <eblake@redhat.com> >>>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > >>>> @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io >>>> echo >>>> echo "== final server log ==" >>>> cat "$TEST_DIR/server.log" >>>> +rm -f $TEST_DIR/server.log >>> >>> I'm not sure how well the iotests currently cope with spaced dir names >>> anyway, but it looks weird to not use quotes here right after a line >>> that does. >> >> Yes, that is a mistake since we tried quoting throughout the file > > Can fix that while staging through my NBD queue. I'll probably send a PR > on Monday. That's OK for me. Max
On Fri, Feb 22, 2019 at 09:54:25AM -0600, Eric Blake wrote: > On 2/22/19 9:16 AM, Daniel P. Berrangé wrote: > > On Fri, Feb 22, 2019 at 04:06:32PM +0100, Max Reitz wrote: > >> On 20.02.19 15:58, Daniel P. Berrangé wrote: > >>> If we abort the iotest early the server.log file might contain useful > >>> information for diagnosing the problem. Ensure its contents are > >>> displayed in this case. > >>> > >>> Reviewed-by: Eric Blake <eblake@redhat.com> > >>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > > >>> @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io > >>> echo > >>> echo "== final server log ==" > >>> cat "$TEST_DIR/server.log" > >>> +rm -f $TEST_DIR/server.log > >> > >> I'm not sure how well the iotests currently cope with spaced dir names > >> anyway, but it looks weird to not use quotes here right after a line > >> that does. > > > > Yes, that is a mistake since we tried quoting throughout the file > > Can fix that while staging through my NBD queue. I'll probably send a PR > on Monday. Great, thanks. Regards, Daniel
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 index fc345a1a46..27932df075 100755 --- a/tests/qemu-iotests/233 +++ b/tests/qemu-iotests/233 @@ -30,6 +30,8 @@ _cleanup() { nbd_server_stop _cleanup_test_img + # If we aborted early we want to see this log for diagnosis + test -f "$TEST_DIR/server.log" && cat "$TEST_DIR/server.log" rm -f "$TEST_DIR/server.log" tls_x509_cleanup } @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io echo echo "== final server log ==" cat "$TEST_DIR/server.log" +rm -f $TEST_DIR/server.log # success, all done echo "*** done"