HGKeeper

Fix crash in runtime if PSK secret is missing

2019-03-13, Andrey Skvortsov

a3ec35ee94e7

Executable

Fix crash in runtime if PSK secret is missing

./Beremiz_service.py -s $PWD/psk2.txt -n beremiz /tmp/beremiz
Beremiz_service: 1.2-1378c18402c3+

Traceback (most recent call last):
File "./Beremiz_service.py", line 511, in
ensurePSK(servicename, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 32, in ensurePSK
PSKgen(ID, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 23, in PSKgen
call(restart_stunnel_cmdline)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/spawn_subprocess.py", line 116, in call
pid = posix_spawn.posix_spawnp(cmd[0], cmd)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 120, in posix_spawnp
return _posix_spawn(lib.posix_spawnp, *args, **kwargs)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 111, in _posix_spawn
_check_error(res, path)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 10, in _check_error
raise OSError(errno, os.strerror(errno), path)
OSError: [Errno 2] No such file or directory: '/etc/init.d/S50stunnel'

#!/bin/sh

cleanup()

{

find $PYTEST_DIR -name '*.pyc' -delete

}

print_help()

{

echo "Usage: run_python_tests.sh [--on-local-xserver]"

echo ""

echo "--on-local-xserver"

echo " all tests are run on local X-server. "

echo " User can see test in action."

echo " Any interaction (mouse, keyboard) should be avoided"

echo " By default without arguments script runs pytest on virtual X serverf."

echo ""

exit 1

}

main()

{

LC_ALL=ru_RU.utf-8

PYTEST_DIR=./tests/tools

if [ ! -d $PYTEST_DIR ]; then

echo "Script should be run from top directory in repository"

exit 1;

use_xvfb=0

if [ "$1" != "--on-local-xserver" ]; then

export DISPLAY=:42

use_xvfb=1

Xvfb $DISPLAY -screen 0 1280x1024x24 &

sleep 1

cleanup

ret=0

DELAY=400

KILL_DELAY=$(($DELAY + 30))

timeout -k $KILL_DELAY $DELAY pytest --timeout=10 ./tests/tools

ret=$?

cleanup

[ $use_xvfb = 1 ] && pkill -9 Xvfb

exit $ret

}

[ "$1" = "--help" -o "$1" = "-h" ] && print_help

main $@