From 9c0b53551b54ccc0c813e1ad7449e1e3e52520fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= <oehrstroem@gmail.com>
Date: Sat, 5 Feb 2022 17:34:10 +0100
Subject: [PATCH] Add missing config files for test.

---
 tests/config9/wmbusmeters.conf      |  2 ++
 tests/config9/wmbusmeters.d/ApWater |  4 ++++
 tests/config9/wmbusmeters.d/Vatten  |  4 ++++
 tests/config9/wmbusmeters.d/Wasser  |  4 ++++
 tests/test_config_overrides.sh      | 19 ++++++++++---------
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 tests/config9/wmbusmeters.conf
 create mode 100644 tests/config9/wmbusmeters.d/ApWater
 create mode 100644 tests/config9/wmbusmeters.d/Vatten
 create mode 100644 tests/config9/wmbusmeters.d/Wasser

diff --git a/tests/config9/wmbusmeters.conf b/tests/config9/wmbusmeters.conf
new file mode 100644
index 0000000..ecd399d
--- /dev/null
+++ b/tests/config9/wmbusmeters.conf
@@ -0,0 +1,2 @@
+loglevel=verbose
+format=json
diff --git a/tests/config9/wmbusmeters.d/ApWater b/tests/config9/wmbusmeters.d/ApWater
new file mode 100644
index 0000000..349572a
--- /dev/null
+++ b/tests/config9/wmbusmeters.d/ApWater
@@ -0,0 +1,4 @@
+name=ApWater
+driver=apator162
+id=88888888
+key=00000000000000000000000000000000
diff --git a/tests/config9/wmbusmeters.d/Vatten b/tests/config9/wmbusmeters.d/Vatten
new file mode 100644
index 0000000..99ad911
--- /dev/null
+++ b/tests/config9/wmbusmeters.d/Vatten
@@ -0,0 +1,4 @@
+name=Vatten
+driver=multical21
+id=76348799
+key=28F64A24988064A079AA2C807D6102AE
diff --git a/tests/config9/wmbusmeters.d/Wasser b/tests/config9/wmbusmeters.d/Wasser
new file mode 100644
index 0000000..f18f108
--- /dev/null
+++ b/tests/config9/wmbusmeters.d/Wasser
@@ -0,0 +1,4 @@
+name=Wasser
+driver=supercom587
+id=77777777
+key=5065747220486F6C79737A6577736B69
\ No newline at end of file
diff --git a/tests/test_config_overrides.sh b/tests/test_config_overrides.sh
index 70e453f..ea30f9f 100755
--- a/tests/test_config_overrides.sh
+++ b/tests/test_config_overrides.sh
@@ -2,7 +2,13 @@
 
 PROG="$1"
 
-TEST=testaes
+if [ "$PROG" = "" ]
+then
+    echo Please supply the binary to be tested as the first argument.
+    exit 1
+fi
+
+TEST=testoutput
 
 rm -rf $TEST
 mkdir -p $TEST
@@ -10,17 +16,9 @@ mkdir -p $TEST
 TESTNAME="Test config override with oneshot"
 TESTRESULT="ERROR"
 
-EXTRA="C1;1;1;2020-01-23 10:25:13.000;97;148;76348799;0x2A442D2C998734761B168D2091D37CAC21E1D68CDAFFCD3DC452BD802913FF7B1706CA9E355D6C2701CC24"
-
 cat simulations/serial_aes.msg | grep '^{' | tr -d '#' > $TEST/test_expected.txt
 cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt
 
-# Pad with some more telegrams to make sure oneshot triggers before stdin eof triggers close of wmbusmeters.
-for i in 1 2 3 4 5 6 7 8 9 10
-do
-    echo "$EXTRA" >> $TEST/test_input.txt
-done
-
 cat $TEST/test_input.txt | $PROG --useconfig=tests/config9 --device=stdin:rtlwmbus --oneshot > $TEST/test_output.txt 2> $TEST/test_stderr.txt
 
 if ! grep -q "(main) all meters have received at least one update, stopping." $TEST/test_stderr.txt
@@ -36,6 +34,9 @@ if [ "$?" = "0" ]
 then
     echo "OK: $TESTNAME"
     TESTRESULT="OK"
+else
+    echo "ERROR: $TESTNAME"
+    exit 1
 fi
 
 TESTNAME="Test config override with exitafter"