[ovs-dev] [PATCH] ovsdb-client.at: Fix ovsdb-client backup test on Win
Alin Gabriel Serdean
aserdean at ovn.org
Sun Jan 14 18:26:47 UTC 2018
The test:
1948. ovsdb-client.at:15: testing ovsdb-client backup and restore
fails on Windows with:
--- /dev/null 2018-01-14 20:09:57 +0200
+++ /c/_2018/january/14/ovs/tests/testsuite.dir/at-groups/1948/stderr
@@ -0,0 +1,3 @@
+ovsdb-server: ovsdb error: backup: unexpected file format
+ovsdb-server: Failed to read from child (The pipe has been ended.
+)
./ovsdb-client.at:111: exit code was 1, expected 0
The root cause is that when redirecting output defaults to the Windows line
endings(CRLF):
$ file db
db: ASCII text, with very long lines
$ file backup
backup: ASCII text, with very long lines, with CRLF line terminators
Add a `dos2unix` command to convert to the line endings expected by
ovsdb-server.
Signed-off-by: Alin Gabriel Serdean <aserdean at ovn.org>
---
tests/ovsdb-client.at | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at
index 467175f..2f1f63b 100644
--- a/tests/ovsdb-client.at
+++ b/tests/ovsdb-client.at
@@ -49,6 +49,9 @@ AT_CAPTURE_FILE([ovsdb-server.log])
dnl Dump a copy of the data and a backup of it.
AT_CHECK([ovsdb-client dump > dump1])
AT_CHECK([ovsdb-client backup > backup])
+if test "$IS_WIN32" = "yes"; then
+ dos2unix backup
+fi
dnl Mess up the data a little, verify that it changed, then restore it
dnl and verify restoration.
--
2.10.2.windows.1
More information about the dev
mailing list