diff options
| author | Dave Davenport <qball@gmpclient.org> | 2016-01-04 21:51:08 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2016-01-04 21:51:08 +0100 |
| commit | 200f8e5faae0b56b52294ccff15560a13a42f582 (patch) | |
| tree | 6f327e8df7a8e44cc69cc5bffad71f7f45048942 | |
| parent | fefd992c11313732de59cca1a8178474954804d8 (diff) | |
Do not test the ones that require window manager.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | test/run_dmenu_normal_window_test.sh | 9 | ||||
| -rwxr-xr-x | test/run_test.sh | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 56a04033..f6c3501f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ addons: - xvfb - discount - xdotool - - fluxbox compiler: - gcc diff --git a/Makefile.am b/Makefile.am index e82b6fcd..bdbd6c34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -204,6 +204,8 @@ test-x: ${bin_PROGRAMS} $(top_srcdir)/test/run_test.sh 217 $(top_srcdir)/test/run_fuzzy_test.sh $(top_builddir) echo "Test config dump" $(top_srcdir)/test/run_test.sh 218 $(top_srcdir)/test/xr_config_test.sh $(top_builddir) $(top_srcdir) + +test-x1: ${bin_PROGRAMS} echo "Test dmenu-normal-window" $(top_srcdir)/test/run_test.sh 219 $(top_srcdir)/test/run_dmenu_normal_window_test.sh $(top_builddir) echo "Test window" diff --git a/test/run_dmenu_normal_window_test.sh b/test/run_dmenu_normal_window_test.sh index 2fb731ef..24517d52 100755 --- a/test/run_dmenu_normal_window_test.sh +++ b/test/run_dmenu_normal_window_test.sh @@ -3,9 +3,16 @@ # wait till it is up, run rofi with error message sleep 1; echo -e -n "aap\nnoot\nmies" | rofi -dmenu -normal-window > output.txt & +sleep 1 +echo "move" +xdotool mousemove 10 10 +sleep 1 +echo "click" +xdotool click 1 RPID=$! sleep 4 -xdotool getactivewindow windowsize 100% 100% +#xdotool getactivewindow windowsize 100% 100% +echo "Window resized" # send enter. sleep 1 xdotool key 'Down' diff --git a/test/run_test.sh b/test/run_test.sh index 9f6bfff8..dc1f13e1 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash XPID= -FPID= function create_fake_x ( ) { export DISPLAY=":$1" @@ -9,9 +8,6 @@ function create_fake_x ( ) Xvfb ${DISPLAY} & XPID=$! sleep 1 - fluxbox & - FPID=$! - sleep 1 } function destroy_fake_x ( ) @@ -19,8 +15,6 @@ function destroy_fake_x ( ) if [ -n "${XPID}" ] then echo "Stopping fake X: ${XPID}" - kill ${FPID} - wait ${FPID} kill ${XPID} wait ${XPID} fi |