From f5e542ef6735652338fca0b86cefcd9578b4a2ce Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Mon, 4 Sep 2017 14:29:51 +0200
Subject: [PATCH] tests: some cleanup

---
 tests/integration/node-loopback-socket.sh   | 8 +++++---
 tests/integration/pipe-file-advio.sh        | 2 +-
 tests/integration/pipe-loopback-loopback.sh | 4 ----
 tests/integration/pipe-loopback-socket.sh   | 8 +++-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/tests/integration/node-loopback-socket.sh b/tests/integration/node-loopback-socket.sh
index d8b9315d7..7348bc6df 100755
--- a/tests/integration/node-loopback-socket.sh
+++ b/tests/integration/node-loopback-socket.sh
@@ -39,17 +39,19 @@ cat > ${CONFIG_FILE} <<EOF
 			"type": "socket",
 			"layer": "udp",
 			"local": "*:12000",
-			"remote": "127.0.0.1:12001"
+			"remote": "127.0.0.1:12001",
+			"vectorize" : 10
 		},
 		"node2": {
 			"type": "socket",
 			"layer": "udp",
 			"local": "*:12001",
-			"remote": "127.0.0.1:12000"
+			"remote": "127.0.0.1:12000",
+			"vectorize" : 1
 		}
 	},
 	"paths": [
-		{ "in": "node1", "out": "node1" }
+		{ "in": "node1", "out": "node1", "hooks" : [ { "type" : "print" } ] }
 	]
 }
 EOF
diff --git a/tests/integration/pipe-file-advio.sh b/tests/integration/pipe-file-advio.sh
index 4bd7cdbd1..aa0681bac 100755
--- a/tests/integration/pipe-file-advio.sh
+++ b/tests/integration/pipe-file-advio.sh
@@ -52,7 +52,7 @@ cat > ${CONFIG_FILE} <<EOF
 EOF
 
 # Delete old file
-curl -X DELETE ${URI} > /dev/null
+curl -sX DELETE ${URI} > /dev/null
 
 VILLAS_LOG_PREFIX=$(colorize "[Signal] ") \
 villas-signal random -n -l ${NUM_SAMPLES} > ${INPUT_FILE}
diff --git a/tests/integration/pipe-loopback-loopback.sh b/tests/integration/pipe-loopback-loopback.sh
index d057f640d..42ce6b8cc 100755
--- a/tests/integration/pipe-loopback-loopback.sh
+++ b/tests/integration/pipe-loopback-loopback.sh
@@ -44,10 +44,6 @@ villas-signal random -l ${NUM_SAMPLES} -n > ${INPUT_FILE}
 # We delay EOF of the INPUT_FILE by 1 second in order to wait for incoming data to be received
 villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
 
-cat ${INPUT_FILE}
-echo
-cat ${OUTPUT_FILE}
-
 # Comapre data
 villas-test-cmp ${INPUT_FILE} ${OUTPUT_FILE}
 RC:$?
diff --git a/tests/integration/pipe-loopback-socket.sh b/tests/integration/pipe-loopback-socket.sh
index 25e1fd9e7..ec5fb5edd 100755
--- a/tests/integration/pipe-loopback-socket.sh
+++ b/tests/integration/pipe-loopback-socket.sh
@@ -38,7 +38,6 @@ villas-signal random -l ${NUM_SAMPLES} -n > ${INPUT_FILE}
 
 for FORMAT	in csv json villas csv msg gtnet-fake raw-flt32 gtnet-fake; do
 for LAYER	in udp ip eth; do
-for HEADER	in none default; do
 for ENDIAN	in big little; do
 for VERIFY_SOURCE in true false; do
 	
@@ -79,7 +78,6 @@ cat > ${CONFIG_FILE} << EOF
 			"vectorize" : ${VECTORIZE},
 			"format" : "${FORMAT}",
 			"layer" : "${LAYER}",
-			"header" : "${HEADER}",
 			"endian" : "${ENDIAN}",
 			"verify_source" : ${VERIFY_SOURCE},
 
@@ -103,7 +101,7 @@ villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
 RC=$?
 
 if (( ${RC} != 0 )); then
-	echo "=========== Sub-test failed for: format=${FORMAT}, layer=${LAYER}, header=${HEADER}, endian=${ENDIAN}, verify_source=${VERIFY_SOURCE}, vectorize=${VECTORIZE}"
+	echo "=========== Sub-test failed for: format=${FORMAT}, layer=${LAYER}, endian=${ENDIAN}, verify_source=${VERIFY_SOURCE}, vectorize=${VECTORIZE}"
 	cat ${CONFIG_FILE}
 	echo
 	cat ${INPUT_FILE}
@@ -111,10 +109,10 @@ if (( ${RC} != 0 )); then
 	cat ${OUTPUT_FILE}
 	exit ${RC}
 else
-	echo "=========== Sub-test succeeded for: format=${FORMAT}, layer=${LAYER}, header=${HEADER}, endian=${ENDIAN}, verify_source=${VERIFY_SOURCE}, vectorize=${VECTORIZE}"
+	echo "=========== Sub-test succeeded for: format=${FORMAT}, layer=${LAYER}, endian=${ENDIAN}, verify_source=${VERIFY_SOURCE}, vectorize=${VECTORIZE}"
 fi
 
-done; done; done; done; done; done
+done; done; done; done; done
 
 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${THEORIES}