Merge lp:~canonical-platform-qa/ubuntu-clock-app/xvfb_and_qml_tests into lp:ubuntu-clock-app

[Leo Arias]

There is one test that fails, I want to see if Jenkins runs it.

There is one test that fails, I want to see if Jenkins runs it.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:96
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/ubuntu-clock-app/xvfb_and_qml_tests/+merge/234421/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/457/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/303
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/104

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/457/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:96
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/460/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/306
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/107

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/460/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

The test fails on my system as well. It is a known failure. I will fix asap. However jenkins at the moment is only configured to run AP tests. You will need to talk to fginther about enabling jenkins to run the qml tests as well.

[Nekhelesh Ramananthan (nik90)]

67 -if(NOT CLICK_MODE)
68 - add_subdirectory(tests)
69 -endif(NOT CLICK_MODE)

I believe this was added in the first place to ensure that the tests folder does not make its way into the clock app click package since the click package doesn't need to also include tests. I see that you added,

102 +add_subdirectory(unit)
103 +
104 +if(NOT CLICK_MODE)
105 + add_subdirectory(autopilot)
106 +endif(NOT CLICK_MODE)

But doesn't that mean that the units directory is still included in the click package?

review: Needs Information

[Leo Arias (elopio)]

I built the package with click-buddy, and then:

click contents com.ubuntu.clock_3.1.96_amd64.click | grep tst

There doesn't seem to be tst files added to the package. Do you know who added that if originally, to ask him?

[lp:~canonical-platform-qa/ubuntu-clock-app/xvfb_and_qml_tests]

97. By Leo Arias on 2014-09-12

Merged with prerequisite.

98. By Leo Arias on 2014-09-12

Added qttest to the debian build deps.

99. By Leo Arias on 2014-09-12

Added the make test to the debian build.

100. By Leo Arias on 2014-09-12

Added xvfb to the deps.

101. By Leo Arias on 2014-09-16

Added dev tools to the deps.

102. By Leo Arias on 2014-09-16

Added the ubuntu components to the deps.

103. By Leo Arias on 2014-09-16

Merged with trunk.

104. By Leo Arias on 2014-09-23

Merged with prerequisite.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-08 07:37:22 +0000
+++ CMakeLists.txt	2014-09-12 05:06:07 +0000
@@ -15,6 +15,9 @@
 
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Build as a click package" on)
+option(USE_XVFB "Use XVFB to run qml tests" on)
+
+enable_testing()
 
 set(APP_NAME                clock)
 set(APP_HARDCODE            ubuntu-clock-app)
@@ -23,8 +26,8 @@
 SET(AUTOPILOT_DIR           ubuntu_clock_app)
 set(URLS_FILE               "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 
-# Standard install paths 
-include(GNUInstallDirs) 
+# Standard install paths
+include(GNUInstallDirs)
 
 #set install paths
 if(CLICK_MODE)
@@ -35,11 +38,11 @@
   set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
   set(MODULE_PATH ${QT_IMPORTS_DIR})
   if(NOT BZR_REVNO)
-    execute_process( 
+    execute_process(
       COMMAND bzr revno
-              OUTPUT_VARIABLE BZR_REVNO 
+              OUTPUT_VARIABLE BZR_REVNO
               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-              OUTPUT_STRIP_TRAILING_WHITESPACE 
+              OUTPUT_STRIP_TRAILING_WHITESPACE
       )
   endif(NOT BZR_REVNO)
   if(NOT BZR_SOURCE)
@@ -48,17 +51,17 @@
   endif(NOT BZR_SOURCE)
 else(CLICK_MODE)
   set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app")
-  execute_process( 
-    COMMAND qmake -query QT_INSTALL_QML 
-            OUTPUT_VARIABLE QT_IMPORTS_DIR 
-            OUTPUT_STRIP_TRAILING_WHITESPACE 
+  execute_process(
+    COMMAND qmake -query QT_INSTALL_QML
+            OUTPUT_VARIABLE QT_IMPORTS_DIR
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
   set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
 endif(CLICK_MODE)
 
 if(${CLICK_MODE})
   message("-- Configuring manifest.json")
- 
+
   execute_process(
     COMMAND dpkg-architecture -qDEB_HOST_ARCH
     OUTPUT_VARIABLE CLICK_ARCH
@@ -82,21 +85,13 @@
 add_subdirectory(app)
 add_subdirectory(backend)
 add_subdirectory(po)
-if(NOT CLICK_MODE)
-  add_subdirectory(tests)
-endif(NOT CLICK_MODE)
+add_subdirectory(tests)
 
 add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/tests/autopilot/run
                     COMMAND ${CMAKE_SOURCE_DIR}/tests/autopilot/run
                     DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
                     WORKING_DIRECTORY ./app)
 
-enable_testing()
-add_test(NAME basic
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/app
-  COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/tests/unit -import ${CMAKE_BINARY_DIR}/backend
-)
-
 add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/ubuntu-clock-app.qml
                     DEPENDS timezone timezone-qmldir alarmsettings alarmsettings-qmldir datetime datetime-qmldir
                     WORKING_DIRECTORY ./app)

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-08-13 14:38:12 +0000
+++ backend/CMakeLists.txt	2014-09-12 05:06:07 +0000
@@ -1,3 +1,5 @@
+project(backend)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-08-08 15:57:16 +0000
+++ tests/CMakeLists.txt	2014-09-12 05:06:07 +0000
@@ -1,1 +1,6 @@
-add_subdirectory(autopilot)
+add_subdirectory(unit)
+
+if(NOT CLICK_MODE)
+  add_subdirectory(autopilot)
+endif(NOT CLICK_MODE)
+

=== added file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/CMakeLists.txt	2014-09-12 05:06:07 +0000
@@ -0,0 +1,38 @@
+find_program(QMLTESTRUNNER_BIN
+    NAMES qmltestrunner
+    PATHS /usr/lib/*/qt5/bin
+    NO_DEFAULT_PATH
+)
+
+find_program(XVFB_RUN_BIN
+    NAMES xvfb-run
+)
+
+macro(DECLARE_QML_TEST TST_NAME TST_QML_FILE)
+    if(USE_XVFB)
+        set(COMMAND_PREFIX ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24")
+    else()
+        set(COMMAND_PREFIX "")
+    endif()
+    add_test(NAME ${TST_NAME}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${COMMAND_PREFIX} ${QMLTESTRUNNER_BIN} -import ${backend_BINARY_DIR} -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
+    )
+endmacro()
+
+if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
+    declare_qml_test("AlarmLabel" tst_alarmLabel.qml)
+    declare_qml_test("AlarmRepeat" tst_alarmRepeat.qml)
+else()
+    if (NOT QMLTESTRUNNER_BIN)
+        message(WARNING "Qml tests disabled: qmltestrunner not found")
+    else()
+        message(WARNING "Qml tests disabled: xvfb-run not found")
+    endif()
+endif()
+
+set(QML_TST_FILES
+    tst_alarmLabel.qml
+    tst_alarmRepeat.qml
+)
+add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})