HGKeeper

Additional fix for rewrite ForceVariableDialog commit (9076249f)

2019-02-14, Andrey Skvortsov

4f78f0e201d9

Executable

Additional fix for rewrite ForceVariableDialog commit (9076249f)

fix following backtrace:

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_core.py", line 16765, in
lambda event: event.callable(*event.args, **event.kw) )
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 232, in HandleButton
button.ProcessCallback()
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/GraphButton.py", line 156, in ProcessCallback
self.Callback()
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 350, in OnForceButton
self.ForceValue(self.ItemsDict.values()[0])
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 428, in ForceValue
dialog.GetValue())
File "/home/developer/WorkData/PLC/beremiz/beremiz/dialogs/ForceVariableDialog.py", line 232, in GetValue
return GetTypeValue[self.IEC_Type](wx.TextEntryDialog.GetValue(self))
TypeError: unbound method GetValue() must be called with TextEntryDialog instance as first argument (got ForceVariableDialog instance instead)

#!/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 $@