Index: tests/unit_tests/test_dg_valves.py =================================================================== diff -u -rfb9052e39fb778d3d029eda4d6917a0a1fcb9cbd -r82615ab9d1757ef67810f9fc267cd89a19a2e4c8 --- tests/unit_tests/test_dg_valves.py (.../test_dg_valves.py) (revision fb9052e39fb778d3d029eda4d6917a0a1fcb9cbd) +++ tests/unit_tests/test_dg_valves.py (.../test_dg_valves.py) (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -57,4 +57,4 @@ if __name__ == '__main__': - unittest.main(verbosity=2) + sys.exit(unittest.main(verbosity=2).result.wasSuccessful()) Index: tests/unit_tests/test_ui_proxy.py =================================================================== diff -u -r845669bbaf690d94b555a7b257180f64f17afa3e -r82615ab9d1757ef67810f9fc267cd89a19a2e4c8 --- tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 845669bbaf690d94b555a7b257180f64f17afa3e) +++ tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -32,4 +32,4 @@ if __name__ == '__main__': - unittest.main(verbosity=2) + sys.exit(unittest.main(verbosity=2).result.wasSuccessful()) Index: tools/bring_can_interface_down.sh =================================================================== diff -u --- tools/bring_can_interface_down.sh (revision 0) +++ tools/bring_can_interface_down.sh (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -0,0 +1,29 @@ +#!/bin/bash +########################################################################### +# +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file bring_can_iface_down.sh +# +# @date 29-Jul-2020 +# @author P. Lucia +# +# @brief Bring down the specified interface +# +############################################################################ +iface="can0" +if [ "$#" -gt 1 ]; then + echo "Please provide only one can interface." + echo "Usage (defaults to can0): ./bring_can_iface_down.sh " + echo " Use instead: setup_canbus.sh " + exit 1 +elif [ "$#" -eq 1 ]; then + iface="$1" +fi + +sudo ifconfig "$iface" down > /dev/null 2>&1 +sudo ip link delete dev "$iface" > /dev/null 2>&1 + Index: tools/run_unit_tests.sh =================================================================== diff -u --- tools/run_unit_tests.sh (revision 0) +++ tools/run_unit_tests.sh (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -0,0 +1,39 @@ +#!/bin/bash +########################################################################### +# +# Copyright (c) 2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file install_to_venv.sh +# +# @date 20-July-2020 +# @author Peter Lucia +# +# @brief This script builds dialin then installs it to the provided virtual +# environment +# +############################################################################ + +./bring_can_interface_down.sh vcan0 +./bring_can_interface_down.sh can0 +./setup_virtual_can.sh can0 +ORIG_DIR=$(pwd) +source ../venv/bin/activate +cd ../tests/unit_tests + +for each in *.py +do + python3 "$each" + result=$? + if [ "$result" -ne 0 ]; then + echo "Test $each failed" + exit 1 + else + echo "Test $each passed with exit code $result" + fi +done + +cd $ORIG_DIR +./bring_can_interface_down.sh can0 Index: tools/setup_canbus.sh =================================================================== diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -r82615ab9d1757ef67810f9fc267cd89a19a2e4c8 --- tools/setup_canbus.sh (.../setup_canbus.sh) (revision 61479ce1965fdcf793913f5e58af92e56c3aea67) +++ tools/setup_canbus.sh (.../setup_canbus.sh) (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -14,7 +14,15 @@ # @brief Initializes the canbus interface # ############################################################################ +iface="can0" +if [ "$#" -gt 1 ]; then + echo "Please provide only one can interface." + echo "Usage (defaults to can0): setup_canbus.sh " + echo " Use instead: setup_canbus.sh " + exit 1 +elif [ "$#" -eq 1 ]; then + iface="$1" +fi -sudo ifconfig can0 down -sudo ip link set can0 up type can bitrate 250000 restart-ms 100 +sudo ip link set "$iface" up type can bitrate 250000 restart-ms 100 Index: tools/setup_virtual_can.sh =================================================================== diff -u -ra08757ab36f7555f49526e28b7d2eb799e64769d -r82615ab9d1757ef67810f9fc267cd89a19a2e4c8 --- tools/setup_virtual_can.sh (.../setup_virtual_can.sh) (revision a08757ab36f7555f49526e28b7d2eb799e64769d) +++ tools/setup_virtual_can.sh (.../setup_virtual_can.sh) (revision 82615ab9d1757ef67810f9fc267cd89a19a2e4c8) @@ -14,17 +14,19 @@ # @brief Initializes the virtual can interfaces # ############################################################################ -sudo ifconfig vcan0 down -sudo ifconfig vcan1 down -sudo ip link delete dev vcan0 -sudo ip link delete dev vcan1 +iface="can0" +if [ "$#" -gt 1 ]; then + echo "Please provide only one can interface." + echo "Usage (defaults to can0): ./bring_can_iface_down.sh " + echo " Use instead: setup_canbus.sh " + exit 1 +elif [ "$#" -eq 1 ]; then + iface="$1" +fi -sudo ip link add dev vcan0 type vcan -sudo ip link add dev vcan1 type vcan +sudo ip link add dev "$iface" type vcan -sudo ip link set vcan0 up -sudo ifconfig vcan0 txqueuelen 10000 +sudo ip link set "$iface" up +sudo ifconfig "$iface" txqueuelen 10000 -sudo ip link set vcan1 up -sudo ifconfig vcan1 txqueuelen 10000