tests: fix a lot of the integration tests

2025-03-09 00:00:00 +01:00 · 2020-09-10 17:32:02 +02:00 · 2020-09-10 17:32:02 +02:00 · 461980dbcf
commit 461980dbcf
parent 6b4e9bbcbd
41 changed files with 152 additions and 57 deletions
--- a/tests/integration/api-capabilities.sh
+++ b/tests/integration/api-capabilities.sh
@ -44,4 +44,4 @@ RC=$?

 rm ${FETCHED_CONF}

-exit $RC
+exit ${RC}
--- a/tests/integration/api-config.sh
+++ b/tests/integration/api-config.sh
@ -61,4 +61,4 @@ RC=$?

 rm -f ${FETCHED_CONF} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/api-nodes.sh
+++ b/tests/integration/api-nodes.sh
@ -80,4 +80,4 @@ RC=$?

 rm -f ${CONFIG_FILE} ${FETCHED_NODES}

-exit $RC
+exit ${RC}
--- a/tests/integration/api-paths.sh
+++ b/tests/integration/api-paths.sh
@ -80,4 +80,4 @@ RC=$?

 rm -f ${CONFIG_FILE} ${FETCHED_PATHS}

-exit $RC
+exit ${RC}
--- a/tests/integration/api-restart.sh
+++ b/tests/integration/api-restart.sh
@ -83,4 +83,4 @@ RC=$?

 rm -f ${LOCAL_CONF} ${FETCHED_CONF} ${BASE_CONF}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-average.sh
+++ b/tests/integration/hook-average.sh
@ -62,4 +62,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-cast.sh
+++ b/tests/integration/hook-cast.sh
@ -62,4 +62,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-decimate.sh
+++ b/tests/integration/hook-decimate.sh
@ -55,4 +55,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-dp.sh
+++ b/tests/integration/hook-dp.sh
@ -52,4 +52,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-drop.sh
+++ b/tests/integration/hook-drop.sh
@ -61,4 +61,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-gate.sh
+++ b/tests/integration/hook-gate.sh
@ -57,4 +57,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-limit_rate.sh
+++ b/tests/integration/hook-limit_rate.sh
@ -38,4 +38,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-print.sh
+++ b/tests/integration/hook-print.sh
@ -39,4 +39,4 @@ RC=$?

 rm -f ${OUTPUT_FILE1} ${OUTPUT_FILE2} ${INPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-scale.sh
+++ b/tests/integration/hook-scale.sh
@ -62,4 +62,4 @@ RC=$?

 rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-shift_seq.sh
+++ b/tests/integration/hook-shift_seq.sh
@ -38,4 +38,4 @@ RC=$?

 rm -f ${OUTPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/hook-shift_ts.sh
+++ b/tests/integration/hook-shift_ts.sh
@ -41,4 +41,4 @@ RC=$?

 rm ${STATS_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/node-can.sh
+++ b/tests/integration/node-can.sh
@ -150,4 +150,4 @@ RC=$?
 #rm ${CAN_OUT_FILE} ${INPUT_FILE} ${OUTPUT_FILE}
 rm ${INPUT_FILE} ${OUTPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/node-infiniband.sh
+++ b/tests/integration/node-infiniband.sh
@ -191,7 +191,7 @@ do
    if [[ $RC != 0 ]]; then
        rm ${CONFIG_FILE} ${CONFIG_FILE_TARGET} ${INPUT_FILE} ${OUTPUT_FILE} ${DATAFIFO}
    
-        exit $RC
+        exit ${RC}
    fi

    echo "#############################"
@ -206,4 +206,4 @@ done

 rm ${CONFIG_FILE} ${CONFIG_FILE_TARGET} ${INPUT_FILE} ${OUTPUT_FILE} ${DATAFIFO}

-exit $RC
+exit ${RC}
--- a/tests/integration/node-loopback-socket.sh
+++ b/tests/integration/node-loopback-socket.sh
@ -102,4 +102,4 @@ RC=$?

 rm ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/node-multiple_sources.sh
+++ b/tests/integration/node-multiple_sources.sh
@ -0,0 +1,90 @@
+#!/bin/bash
+#
+# Integration loopback test using villas-node.
+#
+# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
+# @license GNU General Public License (version 3)
+#
+# VILLASnode
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##################################################################################
+
+SCRIPT=$(realpath $0)
+SCRIPTPATH=$(dirname ${SCRIPT})
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
+
+CONFIG_FILE=$(mktemp)
+OUTPUT_FILE1=$(mktemp)
+OUTPUT_FILE2=$(mktemp)
+EXPECT_FILE=$(mktemp)
+
+cat > ${CONFIG_FILE} <<EOF
+{
+  "nodes": {
+    "sig_1": {
+      "type": "signal",
+      "values": 2,
+      "signal": "counter",
+      "offset": 100,
+      "limit": 10
+    },
+    "file_1": {
+        "type": "file",
+        "uri": "${OUTPUT_FILE1}"
+    },
+    "file_2": {
+        "type": "file",
+        "uri": "${OUTPUT_FILE2}"
+    }
+  },
+  "paths": [
+    {
+      "in": [
+        "sig_1.data[0]"
+      ],
+      "out": "file_1"
+    },
+    {
+      "in": [
+        "sig_1.data[0]"
+      ],
+      "out": "file_2"
+    }
+  ]
+}
+EOF
+
+villas signal counter -o 100 -v 1 -l 10 -n > ${EXPECT_FILE}
+
+# Start node
+VILLAS_LOG_PREFIX=$(colorize "[Node]  ") \
+villas-node ${CONFIG_FILE} &
+P1=$!
+
+sleep 2
+
+kill ${P1}
+wait ${P1}
+
+# Compare only the data values
+villas-test-cmp ${OUTPUT_FILE1} ${EXPECT_FILE} && \
+villas-test-cmp ${OUTPUT_FILE2} ${EXPECT_FILE}
+RC=$?
+
+rm ${CONFIG_FILE} ${EXPECT_FILE} \
+   ${OUTPUT_FILE1} ${OUTPUT_FILE2}
+
+exit ${RC}
--- a/tests/integration/node-mux_demux.sh
+++ b/tests/integration/node-mux_demux.sh
@ -28,6 +28,14 @@ source ${SCRIPTPATH}/../../tools/villas-helper.sh

 CONFIG_FILE=$(mktemp)
 OUTPUT_FILE=$(mktemp)
+EXPECT_FILE=$(mktemp)
+
+cat <<EOF > ${EXPECT_FILE}
+1599745986.343431058+1.451000e-06(7)	4.000000	20.000000	100.000000
+1599745986.843081878+8.820000e-07(16)	9.000000	50.000000	200.000000
+1599745987.343081848+9.440000e-07(24)	14.000000	70.000000	300.000000
+1599745987.843081745+8.630000e-07(33)	19.000000	100.000000	400.000000
+EOF

 cat > ${CONFIG_FILE} <<EOF
 {
@ -36,7 +44,7 @@ cat > ${CONFIG_FILE} <<EOF
 			"type": "signal",

 			"signal" : "counter",
-			"values" : 4,
+			"values" : 1,
 			"offset" : 0.0,
 			"rate" : 10.0,
 			"limit" : 20
@ -45,7 +53,7 @@ cat > ${CONFIG_FILE} <<EOF
 			"type": "signal",

 			"signal" : "counter",
-			"values" : 4,
+			"values" : 1,
 			"offset" : 10.0,
 			"amplitude" : 10.0,
 			"rate" : 5.0,
@ -55,7 +63,7 @@ cat > ${CONFIG_FILE} <<EOF
 			"type": "signal",

 			"signal" : "counter",
-			"values" : 4,
+			"values" : 1,
 			"offset" : 100.0,
 			"amplitude" : 100.0,
 			"rate" : 2.0,
@ -63,7 +71,6 @@ cat > ${CONFIG_FILE} <<EOF
 		},
 		"file_1": {
 			"type": "file",
-			
 			"uri" : "${OUTPUT_FILE}"
 		}
 	},
@ -77,9 +84,7 @@ cat > ${CONFIG_FILE} <<EOF
 				"sig_1.hdr.sequence",
 				"sig_1.ts.origin"
 			],
-			"hooks" : [
-				{ "type" : "print" }
-			],
+			"out": "file_1",
 			"mode" : "all"
 		}
 	]
@ -88,13 +93,12 @@ EOF

 # Start node
 VILLAS_LOG_PREFIX=$(colorize "[Node]  ") \
-villas-node ${CONFIG_FILE} &
+villas-node ${CONFIG_FILE}

-sleep 10
+# Compare only the data values
+villas-test-cmp ${OUTPUT_FILE} ${EXPECT_FILE}
+RC=$?

-# Stop node
-kill %1
+rm ${CONFIG_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

-rm ${CONFIG_FILE} ${OUTPUT_FILE}
-
-exit $RC
+exit ${RC}
--- a/tests/integration/node-stats.sh
+++ b/tests/integration/node-stats.sh
@ -40,7 +40,7 @@ cat > ${CONFIG_FILE} <<EOF
 			"rate": 10.0,
 			"in": {
 				"signals": [
-					{ "name": "gap", "stats": "signal_1.gap_sent.mean" },
+					{ "name": "gap",   "stats": "signal_1.gap_sent.mean" },
 					{ "name": "total", "stats": "signal_1.owd.total" }
 				]
 			}
@ -48,6 +48,7 @@ cat > ${CONFIG_FILE} <<EOF
 		"signal_1": {
 			"type": "signal",
 			"limit": 100,
+			"signal": "sine",
 			"rate": ${RATE},
 			"in" : {
 				"hooks": [
@ -80,8 +81,8 @@ villas-node ${CONFIG_FILE} &
 PID=$!

 sleep 5
-
 kill ${PID}
+wait ${PID}

 tail -n1 ${STATS_LOG} | jq -e "(.data[0] - 1/${RATE} | length) < 1e-4 and .data[1] == 99" > /dev/null
 RC=$?
--- a/tests/integration/pipe-file-advio.sh
+++ b/tests/integration/pipe-file-advio.sh
@ -77,4 +77,4 @@ RC=$?

 rm -f ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-amqp.sh
+++ b/tests/integration/pipe-loopback-amqp.sh
@ -79,4 +79,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-exec.sh
+++ b/tests/integration/pipe-loopback-exec.sh
@ -58,4 +58,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-file.sh
+++ b/tests/integration/pipe-loopback-file.sh
@ -60,4 +60,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${NODE_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-iec61850-9-2.sh
+++ b/tests/integration/pipe-loopback-iec61850-9-2.sh
@ -73,4 +73,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-loopback.sh
+++ b/tests/integration/pipe-loopback-loopback.sh
@ -49,4 +49,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-mqtt.sh
+++ b/tests/integration/pipe-loopback-mqtt.sh
@ -78,4 +78,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-nanomsg.sh
+++ b/tests/integration/pipe-loopback-nanomsg.sh
@ -71,4 +71,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-rtp-dual.sh
+++ b/tests/integration/pipe-loopback-rtp-dual.sh
@ -133,4 +133,4 @@ rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST}

 kill $PID

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-rtp-remote.sh
+++ b/tests/integration/pipe-loopback-rtp-remote.sh
@ -145,4 +145,4 @@ ${REMOTE} rm ${OUTPUT_FILE} ${CONFIG_FILE_DEST}

 kill ${PID}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-rtp-tbf.sh
+++ b/tests/integration/pipe-loopback-rtp-tbf.sh
@ -138,4 +138,4 @@ RC=$?
 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST}

 kill $PID
-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-rtp.sh
+++ b/tests/integration/pipe-loopback-rtp.sh
@ -90,4 +90,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-shmem.sh
+++ b/tests/integration/pipe-loopback-shmem.sh
@ -76,4 +76,4 @@ done; done; done

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-socket-multicast.sh
+++ b/tests/integration/pipe-loopback-socket-multicast.sh
@ -64,4 +64,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-socket.sh
+++ b/tests/integration/pipe-loopback-socket.sh
@ -127,4 +127,4 @@ done; done; done

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${THEORIES}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-websocket.sh
+++ b/tests/integration/pipe-loopback-websocket.sh
@ -80,4 +80,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${CONFIG_FILE2}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-loopback-zeromq.sh
+++ b/tests/integration/pipe-loopback-zeromq.sh
@ -70,4 +70,4 @@ RC=$?

 rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/pipe-python-protobuf.sh
+++ b/tests/integration/pipe-python-protobuf.sh
@ -97,4 +97,4 @@ RC=$?

 rm ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

-exit $RC
+exit ${RC}
--- a/tests/integration/test-config.sh
+++ b/tests/integration/test-config.sh
@ -25,13 +25,13 @@

 set -e

-cd ${SRCDIR}/etc/
-
-CONFIGS=$(find . -name '*.conf' -o -name '*.json')
+CONFIGS=$(find ${SRCDIR}/etc/ -name '*.conf' -o -name '*.json')

 for CONFIG in ${CONFIGS}; do
    if [ "$(basename ${CONFIG})" == "opal.conf" ] ||
       [ "$(basename ${CONFIG})" == "paths.conf" ] ||
+	   [ "$(basename ${CONFIG})" == "vc707_ips.conf" ] ||
+	   [ "$(basename ${CONFIG})" == "uldaq.conf" ] ||
       [ "$(basename ${CONFIG})" == "global.conf" ]; then
        echo "=== Skipping config: ${CONFIG}"
        continue