Merge lp:~gerboland/unity-2d/fix-unit-tests into lp:unity-2d

[Gerry Boland]

[tests] Run Unit Tests with Xvfb, disabling those who will not work with this configuration

[tests] Run Unit Tests with Xvfb, disabling those who will not work with this configuration:

- paneltest - Xvfb appears to not support Struts, so it fails
- gnomesessiontest - needs to be rewritten to use a mock gnome-session dbus object with dbus-test-runner

[Gerry Boland (gerboland)]

Note that LauncherViewTest will hang, see bug:894380. There is a separate MR in the queue which proposes a fix for this, and causes "make check" to succeed.

[Tiago Salem Herrmann (tiagosh)]

some tests:

salem@salem-linux:/tmp/fix-unit-tests/build$ /usr/bin/ctest --force-new-ctest-process
Test project /tmp/fix-unit-tests/build
    Start 1: gconnectortest
1/8 Test #1: gconnectortest ................... Passed 0.09 sec
    Start 2: keyboardmodifiersmonitortest
2/8 Test #2: keyboardmodifiersmonitortest ..... Passed 1.81 sec
    Start 3: launchermenutest
3/8 Test #3: launchermenutest ................. Passed 0.14 sec
    Start 4: listaggregatormodeltest
4/8 Test #4: listaggregatormodeltest .......... Passed 0.10 sec
    Start 5: qsortfilterproxymodeltest
5/8 Test #5: qsortfilterproxymodeltest ........ Passed 0.09 sec
    Start 6: focuspathtest
6/8 Test #6: focuspathtest .................... Passed 0.24 sec
    Start 7: unity2dtrtest_check
7/8 Test #7: unity2dtrtest_check ..............***Failed 0.00 sec
    Start 8: launcherviewtest

unity2dtrtest_check fails and launcherviewtest is not exiting.

[Gerry Boland (gerboland)]

Unity2dtrtest fixed.
Launcherviewtest hang is known condition, see first comment

I forgot to say, please make sure you test the Xvfb part. You must install Xvfb, then run

DISPLAY= make check

to make the test run headless, i.e.pretend there is no Xserver.

[Tiago Salem Herrmann (tiagosh)]

Now it works fine. Thanks.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/1/console reported an error when processing this lp:~gerboland/unity-2d/fix-unit-tests branch.
Not merging it.

[lp:~gerboland/unity-2d/fix-unit-tests]

800. By Gerry Boland on 2011-11-25

Merged latest trunk

801. By Gerry Boland on 2011-11-25

[tests] Add LANG variable to unity2dtrtest to fix test on Jenkins

802. By Gerry Boland on 2011-11-25

[tests] Disable LauncherViewTest, need to add a mock dbus-server so that it works with Jenkins

[Gerry Boland (gerboland)]

Branch fixed to work with Jenkins as follows:
- unity2dtr was not called with correct environment variable LANG
- disabling LauncherViewTest as it needs a mock dbus-server object to run.

[lp:~gerboland/unity-2d/fix-unit-tests]

803. By Gerry Boland on 2011-11-28

[tests] Disable unity2dtr test as it fails on Jenkins

Jenkins' chroot does not have any language support installed, so this test fails.

[Tiago Salem Herrmann (tiagosh)]

looks ok. A quick test of "make check" in my environment worked fine also.

review: Approve

=== modified file 'launcher/tests/CMakeLists.txt'
--- launcher/tests/CMakeLists.txt	2011-11-18 12:27:01 +0000
+++ launcher/tests/CMakeLists.txt	2011-11-28 14:11:27 +0000
@@ -1,7 +1,9 @@
 macro(launcher_tests)
     set(_test_list "")
     foreach(_test ${ARGN})
-        add_test(${_test} ${_test})
+        add_test(NAME ${_test} 
+            COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ./${_test}
+            )
         add_executable(${_test} ${_test}.cpp ${_test}.moc)
         qt4_generate_moc(${_test}.cpp ${_test}.moc)
         target_link_libraries(${_test}
@@ -21,6 +23,7 @@
     )
 
 launcher_tests(
-    launcherviewtest
+# FIXME: test need a mock dbus object to message with via dbus-test-runner
+#    launcherviewtest
     )
 

=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2011-11-23 14:04:19 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2011-11-28 14:11:27 +0000
@@ -12,11 +12,13 @@
 
 set(LIBUNITY_2D_TEST_DIR ${libunity-2d-private_BINARY_DIR}/tests)
 
-# Unit-tests
+# Unit-tests (all run with Xvfb)
 macro(libunity_2d_tests)
     set(_test_list "")
     foreach(_test ${ARGN})
-        add_test(${_test} ${_test})
+        add_test(NAME ${_test} 
+            COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ./${_test}
+            )
         add_executable(${_test} ${_test}.cpp ${_test}.moc)
         qt4_generate_moc(${_test}.cpp ${_test}.moc)
         target_link_libraries(${_test}
@@ -31,13 +33,29 @@
 libunity_2d_tests(
     gconnectortest
     keyboardmodifiersmonitortest
-    paneltest
-    unity2dtrtest
     launchermenutest
     listaggregatormodeltest
     qsortfilterproxymodeltest
     focuspathtest
     )
+    
+# unity2dtrtest - FIXME
+#add_test(NAME unity2dtrtest_check
+#    COMMAND /bin/sh unity2dtrtest.sh
+#    )
+add_executable(unity2dtrtest
+    unity2dtrtest.cpp unity2dtrtest.moc
+    )
+qt4_generate_moc(unity2dtrtest.cpp
+    unity2dtrtest.moc
+    )
+target_link_libraries(unity2dtrtest
+    ${QT_QTTEST_LIBRARIES}
+    unity-2d-private
+    unity-2d-private-qml
+    )
+configure_file(unity2dtrtest.sh.in
+    unity2dtrtest.sh @ONLY)
 
 add_custom_target(unity2dtr_po COMMAND
     mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/locale/fr/LC_MESSAGES/
@@ -60,9 +78,10 @@
 configure_file(gnomesessionclienttest.sh.in
     gnomesessionclienttest.sh @ONLY)
 
-add_test(NAME gnomesessionclient_check
-    COMMAND /bin/sh gnomesessionclienttest.sh
-    )
+#FIXME: rewrite this using dbus-test-runner to fake gnome-session messaging
+#add_test(NAME gnomesessionclient_check
+#    COMMAND /bin/sh gnomesessionclienttest.sh
+#    )
 
 # mouseareademo
 add_executable(mouseareademo

=== added file 'libunity-2d-private/tests/unity2dtrtest.sh.in'
--- libunity-2d-private/tests/unity2dtrtest.sh.in	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/tests/unity2dtrtest.sh.in	2011-11-28 14:11:27 +0000
@@ -0,0 +1,1 @@
+LANG=fr_FR.UTF-8 LANGUAGE=fr_FR ./unity2dtrtest

=== modified file 'panel/tests/CMakeLists.txt'
--- panel/tests/CMakeLists.txt	2011-11-18 12:27:01 +0000
+++ panel/tests/CMakeLists.txt	2011-11-28 14:11:27 +0000
@@ -1,7 +1,9 @@
 macro(panel_tests)
     set(_test_list "")
     foreach(_test ${ARGN})
-        add_test(${_test} ${_test})
+        add_test(NAME ${_test} 
+            COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ${_test}
+            )
         add_executable(${_test} ${_test}.cpp ${_test}.moc)
         qt4_generate_moc(${_test}.cpp ${_test}.moc)
         target_link_libraries(${_test}

=== added file 'tests/run-with-xvfb.sh'
--- tests/run-with-xvfb.sh	1970-01-01 00:00:00 +0000
+++ tests/run-with-xvfb.sh	2011-11-28 14:11:27 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Usage: /bin/bash run-with-xvfb.sh <program>
+#
+# Creates Xvfb instance and runs program in that instance. Shuts down Xvfb when done.
+
+if [ $# -ne 1 ]; then
+    echo "Usage /bin/bash run-with-xvfb.sh <program>"
+    exit 1
+fi
+
+if [ "x$DISPLAY" == "x" ]; then
+    Xvfb -ac -noreset -screen 0 1024x768x16 -help 2>/dev/null 1>&2
+    XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; echo "No Display ports available, quit."; exit 1`
+    { Xvfb -ac -noreset -screen 0 1024x768x16 :$XID -screen 0 1024x768x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; }
+    DISPLAY=:$XID $1
+else
+    echo "Note: You are already running an Xserver."
+    $1
+fi