[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] iotests: Change coding style of _filter_nbd in
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 3/8] iotests: Change coding style of _filter_nbd in 083 |
Date: |
Mon, 25 Jan 2016 19:41:10 +0100 |
In order to be able to move _filter_nbd to common.filter in the next
patch, its coding style needs to be adapted to that of common.filter.
That means, we have to convert tabs to four spaces, adjust the alignment
of the last line (done with spaces already, assuming one tab equals
eight spaces), fix the line length of the comment, and add a line break
before the opening brace.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/083 | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 13495bc..36e6de8 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -49,15 +49,16 @@ wait_for_tcp_port() {
done
}
-_filter_nbd() {
- # nbd.c error messages contain function names and line numbers that are
prone
- # to change. Message ordering depends on timing between send and
receive
- # callbacks sometimes, making them unreliable.
- #
- # Filter out the TCP port number since this changes between runs.
- sed -e 's#^.*nbd/.*\.c:.*##g' \
- -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
- -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
+_filter_nbd()
+{
+ # nbd.c error messages contain function names and line numbers that are
+ # prone to change. Message ordering depends on timing between send and
+ # receive callbacks sometimes, making them unreliable.
+ #
+ # Filter out the TCP port number since this changes between runs.
+ sed -e 's#^.*nbd/.*\.c:.*##g' \
+ -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
+ -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
}
check_disconnect() {
--
2.7.0
- [Qemu-devel] [PATCH 0/8] nbd: Fix failed assertion on negotiation error, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 1/8] nbd: client_close on error in nbd_co_client_start, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 2/8] iotests: Rename filter_nbd to _filter_nbd in 083, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 3/8] iotests: Change coding style of _filter_nbd in 083,
Max Reitz <=
- [Qemu-devel] [PATCH 4/8] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 6/8] iotests: Make _filter_nbd support more URL types, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 5/8] iotests: Make _filter_nbd drop log lines, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 7/8] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/01/25
- [Qemu-devel] [PATCH 8/8] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/01/25
- Re: [Qemu-devel] [PATCH 0/8] nbd: Fix failed assertion on negotiation error, Kevin Wolf, 2016/01/26