diff --git a/tests/test_alarm.sh b/tests/test_alarm.sh index 46fe190..b7761cf 100755 --- a/tests/test_alarm.sh +++ b/tests/test_alarm.sh @@ -30,8 +30,8 @@ cat > $TEST/test_expected.txt < /tmp/wmbusmeters_telegram_expected < /tmp/wmbusmeters_alarm_expected < $TEST/test_expected.txt +cat simulations/serial_aes.msg | grep '^{' | jq --sort-keys . | tr -d '#' > $TEST/test_expected.txt cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt -cat $TEST/test_input.txt | $PROG --useconfig=tests/config10 > $TEST/test_output.txt 2> $TEST/test_stderr.txt +cat $TEST/test_input.txt | $PROG --useconfig=tests/config10 2> $TEST/test_stderr.txt | jq --sort-keys . > $TEST/test_output.txt if ! grep -q "(main) all meters have received at least one update, stopping." $TEST/test_stderr.txt then @@ -28,7 +28,7 @@ then exit 1 fi -cat $TEST/test_output.txt | sed 's/"timestamp":"....-..-..T..:..:..Z"/"timestamp":"1111-11-11T11:11:11Z"/' > $TEST/test_response.txt +cat $TEST/test_output.txt | sed 's/"timestamp": "....-..-..T..:..:..Z"/"timestamp": "1111-11-11T11:11:11Z"/' > $TEST/test_response.txt diff $TEST/test_expected.txt $TEST/test_response.txt if [ "$?" = "0" ] then diff --git a/tests/test_config_overrides.sh b/tests/test_config_overrides.sh index 78690cd..3d17d74 100755 --- a/tests/test_config_overrides.sh +++ b/tests/test_config_overrides.sh @@ -16,10 +16,10 @@ mkdir -p $TEST TESTNAME="Test config override with oneshot" TESTRESULT="ERROR" -cat simulations/serial_aes.msg | grep '^{' | tr -d '#' > $TEST/test_expected.txt +cat simulations/serial_aes.msg | grep '^{' | jq --sort-keys . | tr -d '#' > $TEST/test_expected.txt cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt -cat $TEST/test_input.txt | $PROG --useconfig=tests/config9 --overridedevice=stdin:rtlwmbus --oneshot > $TEST/test_output.txt 2> $TEST/test_stderr.txt +cat $TEST/test_input.txt | $PROG --useconfig=tests/config9 --overridedevice=stdin:rtlwmbus --oneshot 2> $TEST/test_stderr.txt | jq --sort-keys . > $TEST/test_output.txt if ! grep -q "(main) all meters have received at least one update, stopping." $TEST/test_stderr.txt then @@ -28,7 +28,7 @@ then exit 1 fi -cat $TEST/test_output.txt | sed 's/"timestamp":"....-..-..T..:..:..Z"/"timestamp":"1111-11-11T11:11:11Z"/' > $TEST/test_response.txt +cat $TEST/test_output.txt | sed 's/"timestamp": "....-..-..T..:..:..Z"/"timestamp": "1111-11-11T11:11:11Z"/' > $TEST/test_response.txt diff $TEST/test_expected.txt $TEST/test_response.txt if [ "$?" = "0" ] then @@ -42,11 +42,11 @@ fi TESTNAME="Test config override with exitafter" TESTRESULT="ERROR" -cat simulations/serial_aes.msg | grep '^{' | tr -d '#' > $TEST/test_expected.txt +cat simulations/serial_aes.msg | grep '^{' | jq --sort-keys . | tr -d '#' > $TEST/test_expected.txt cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt # Read from stdin -{ cat $TEST/test_input.txt ; sleep 4; } | $PROG --useconfig=tests/config9 --overridedevice=stdin:rtlwmbus --exitafter=1s > $TEST/test_output.txt 2> $TEST/test_stderr.txt +{ cat $TEST/test_input.txt ; sleep 4; } | $PROG --useconfig=tests/config9 --overridedevice=stdin:rtlwmbus --exitafter=1s 2> $TEST/test_stderr.txt | jq --sort-keys . > $TEST/test_output.txt if ! grep -q "(serial) exit after " $TEST/test_stderr.txt then