Index: tools/run_server.sh =================================================================== diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r8101db5b5f4518548258c0724c2f50c67d591191 --- tools/run_server.sh (.../run_server.sh) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c) +++ tools/run_server.sh (.../run_server.sh) (revision 8101db5b5f4518548258c0724c2f50c67d591191) @@ -1,3 +1,26 @@ #!/bin/bash +########################################################################### +# +# Copyright (c) 2019-2019 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 run_server.sh +# +# @date 21-Oct-2020 +# @author Peter Lucia +# +# @brief Runs the squishqt server. Uses virtual window manager so +# the mouse and keyboard won't affect the running tests. +# Assumes the following packages have been installed: +# sudo apt install xvfb +# sudo apt install xfwm4 +# +############################################################################ +DISPLAY_NUM=8 /opt/squishqt/bin/squishserver --config addAppPath ~/Desktop -/opt/squishqt/bin/squishserver +./startxvfb.sh $DISPLAY_NUM +DISPLAY=:$DISPLAY_NUM /opt/squishqt/bin/squishserver +./stopxvfb.sh $DISPLAY_NUM +echo "Done." Index: tools/startxvfb.sh =================================================================== diff -u --- tools/startxvfb.sh (revision 0) +++ tools/startxvfb.sh (revision 8101db5b5f4518548258c0724c2f50c67d591191) @@ -0,0 +1,29 @@ +#!/bin/sh +########################################################################### +# +# 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 startxvfb.sh +# +# @date 21-Oct-2020 +# @author Peter Lucia +# +# @brief Starts a virtual display in the background +# +# +############################################################################ +if [ $# -eq 0 ] +then + echo "Usage: $0 new_display_number" + exit +fi + +xvfb-run --server-num=$1 --server-args="-ac -screen 0 1280x1024x24" dbus-run-session xfwm4 & +PID=$! +sleep 4 + +XFWM4PID=`pstree -T -p $PID | grep xfwm4 | sed 's/^.*xfwm4.*(\([0-9]\+\))/\1/'` +echo $XFWM4PID > $HOME/.xvfb_xfwm4_$1.pid Index: tools/stopxvfb.sh =================================================================== diff -u --- tools/stopxvfb.sh (revision 0) +++ tools/stopxvfb.sh (revision 8101db5b5f4518548258c0724c2f50c67d591191) @@ -0,0 +1,25 @@ +#!/bin/sh +########################################################################### +# +# 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 stopxvfb.sh +# +# @date 21-Oct-2020 +# @author Peter Lucia +# +# @brief Stops the provided virtual display number +# +# +############################################################################ +if [ $# -eq 0 ] +then + echo "Usage: $0 new_display_number" + exit +fi + +kill `cat $HOME/.xvfb_xfwm4_$1.pid` +rm $HOME/.xvfb_xfwm4_$1.pid Index: tst_CreateTreatment/test.py =================================================================== diff -u -r3b227c80563721d348a1bc80701c5cfab938d469 -r8101db5b5f4518548258c0724c2f50c67d591191 --- tst_CreateTreatment/test.py (.../test.py) (revision 3b227c80563721d348a1bc80701c5cfab938d469) +++ tst_CreateTreatment/test.py (.../test.py) (revision 8101db5b5f4518548258c0724c2f50c67d591191) @@ -152,11 +152,12 @@ sleep(0.1) mouseDrag(waitForObject(slider_object), - waitForObjectExists(slider_object).width / 2, 5.0, - -15 - waitForObjectExists(slider_object).width / 2, 0, + waitForObjectExists(slider_object).width / 2, + 0, + -35 - waitForObjectExists(slider_object).width / 2, + 0, Qt.NoModifier, Qt.LeftButton) - sleep(0.1) selected_value_object = { @@ -166,10 +167,11 @@ } test.compare(waitForObjectExists(selected_value_object).visible, True) + sleep(0.01) test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"])) mouseClick(waitForObject(slider_object), waitForObjectExists(slider_object).width, 0, Qt.LeftButton) - sleep(0.1) + sleep(0.01) test.compare(waitForObjectExists(selected_value_object).visible, True) test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"])) @@ -288,7 +290,7 @@ hd_simulator.cmd_send_treatment_parameter_validation_response(reject_reasons) - sleep(1) + sleep(0.01) test.compare(waitForObjectExists(names.o_create_treatment_confirm).visible, True)