From b44289022de582228cf4d6d315c1887bee288d3e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 1 Jul 2017 21:26:08 +0200 Subject: [PATCH] tests: remove broken prefixed of node tests --- tests/integration/node-loopback-socket.sh | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/integration/node-loopback-socket.sh b/tests/integration/node-loopback-socket.sh index d9dd8059a..a2ca9f70c 100755 --- a/tests/integration/node-loopback-socket.sh +++ b/tests/integration/node-loopback-socket.sh @@ -26,15 +26,6 @@ CONFIG_FILE=$(mktemp) INPUT_FILE=$(mktemp) OUTPUT_FILE=$(mktemp) -function prefix() { - case $1 in - node) P=$'\\\e[36mnode\\\e[39m: ' ;; - pipe) P=$'\\\e[93mpipe\\\e[39m: ' ;; - cmp) P=$'\\\e[35mcmp\\\e[39m: ' ;; - esac - - sed -e "s/^/$P/" -} NUM_SAMPLES=${NUM_SAMPLES:-10} cat > ${CONFIG_FILE} < ${INPUT_FILE} # Start node -villas-node ${CONFIG_FILE} 2>&1 | prefix node & +villas-node ${CONFIG_FILE} & # Wait for node to complete init sleep 1 # Send / Receive data to node -(villas-pipe ${CONFIG_FILE} node2 > ${OUTPUT_FILE} < <(cat ${INPUT_FILE}; sleep 1; echo -n)) 2>&1 | prefix pipe +villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node2 > ${OUTPUT_FILE} < ${INPUT_FILE} + +# Wait for node to handle samples +sleep 1 # Stop node kill %1 # Compare data -villas-test-cmp ${INPUT_FILE} ${OUTPUT_FILE} 2>&1 | prefix cmp -RC=${PIPESTATUS[0]} +villas-test-cmp ${INPUT_FILE} ${OUTPUT_FILE} +RC=$? rm ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}