Merge lp:~sil2100/click-update-manager/autopilot_package into lp:click-update-manager

[Łukasz Zemczak]

Add an -autopilot binary package for running integration tests, modify the tests themselves so that they work from a separate package

Add an -autopilot binary package for running integration tests, modify the tests themselves so that they work from a separate package

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-armhf-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/click-update-manager-ci/21/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-armhf-ci/22

Click here to trigger a rebuild:
http://s-jenkins:8080/job/click-update-manager-ci/22/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/click-update-manager-autolanding/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-amd64-autolanding/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-armhf-autolanding/10

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-27 17:16:57 +0000
+++ CMakeLists.txt	2013-10-02 12:49:22 +0000
@@ -14,3 +14,5 @@
 add_custom_target(check
     COMMAND xvfb-run -a qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit
 )
+
+add_subdirectory(tests/autopilot)

=== added file 'debian/click-update-manager-autopilot.install'
--- debian/click-update-manager-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/click-update-manager-autopilot.install	2013-10-02 12:49:22 +0000
@@ -0,0 +1,1 @@
+/usr/lib/python*/dist-packages/click_update_manager/

=== added file 'debian/click-update-manager.install'
--- debian/click-update-manager.install	1970-01-01 00:00:00 +0000
+++ debian/click-update-manager.install	2013-10-02 12:49:22 +0000
@@ -0,0 +1,2 @@
+/usr/share/applications/click-update-manager.desktop
+/usr/share/click-update-manager/*

=== modified file 'debian/control'
--- debian/control	2013-09-27 17:43:14 +0000
+++ debian/control	2013-10-02 12:49:22 +0000
@@ -3,17 +3,18 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
- dbus,
- dbus-x11,
- debhelper (>= 9),
- qt5-default,
- qtdeclarative5-dev,
- qtdeclarative5-dev-tools,
- qtdeclarative5-qtquick2-plugin,
- qtdeclarative5-test-plugin,
- qtdeclarative5-ubuntu-click0.1,
- qtdeclarative5-ubuntu-ui-toolkit-plugin,
- xvfb,
+               dbus,
+               dbus-x11,
+               debhelper (>= 9),
+               python:any (>= 2.7),
+               qt5-default,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin,
+               qtdeclarative5-ubuntu-click0.1,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               xvfb,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/click-update-manager
 XS-Testsuite: autopkgtest
@@ -22,6 +23,7 @@
 # again.
 Vcs-Bzr: https://code.launchpad.net/~ubuntuone-hackers/click-update-manager/trunk
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntuone-hackers/click-update-manager/trunk/files
+X-Python-Version: 2.7
 
 Package: click-update-manager
 Architecture: any
@@ -33,3 +35,15 @@
          qtdeclarative5-ubuntu-click0.1,
 Description: UpdateManager for Click packages
  A QML application for managing click package updates
+
+Package: click-update-manager-autopilot
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-autopilot,
+         libautopilot-qt,
+         libqt5test5,
+         click-update-manager (>= ${binary:Version}),
+Description: Test package for the UpdateManager
+ A QML application for managing click package updates. This package contains
+ autopilot integration tests.

=== modified file 'debian/rules'
--- debian/rules	2013-09-26 21:07:17 +0000
+++ debian/rules	2013-10-02 12:49:22 +0000
@@ -7,7 +7,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --parallel --fail-missing
+	dh $@ --parallel --fail-missing --with python2
 
 override_dh_auto_test:
 	dh_auto_build -- check

=== added file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/CMakeLists.txt	2013-10-02 12:49:22 +0000
@@ -0,0 +1,8 @@
+set(AUTOPILOT_DIR click_update_manager)
+
+execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(DIRECTORY ${AUTOPILOT_DIR}
+    DESTINATION ${PYTHON_PACKAGE_DIR}
+    )

=== renamed directory 'tests/autopilot/UpdateManager' => 'tests/autopilot/click_update_manager'
=== modified file 'tests/autopilot/click_update_manager/main/test_main.py'
--- tests/autopilot/UpdateManager/main/test_main.py	2013-09-27 18:26:22 +0000
+++ tests/autopilot/click_update_manager/main/test_main.py	2013-10-02 12:49:22 +0000
@@ -9,13 +9,13 @@
 from testtools.matchers import Is, Not, Equals
 from testtools import skip
 
-from UpdateManager import UbuntuTouchAppTestCase
+from click_update_manager import UbuntuTouchAppTestCase
 
 
 class PageUpdateTests(UbuntuTouchAppTestCase):
     """Page Update Tests."""
 
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../updatemanager")
+    test_qml_file = "/usr/share/click-update-manager/updatemanager.qml"
 
     def test_UI_is_loaded(self):
         """Must be able to see the mainview."""

=== removed file 'tests/autopilot/run'
--- tests/autopilot/run	2013-09-20 20:04:44 +0000
+++ tests/autopilot/run	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
-  exit
-fi
-
-SCRIPTPATH=`dirname $0`
-pushd ${SCRIPTPATH}
-autopilot run UpdateManager
-popd