Merge lp:~pitti/ubuntu-system-settings-online-accounts/py3tests into lp:ubuntu-system-settings-online-accounts

[Martin Pitt]

Run tests with Python 3 autopilot.

The autopilot branch that ships autopilot3-sandbox-run finally landed in
utopic. This makes tests run flawlessly with Python 3, so let's do that.

[Martin Pitt (pitti)]

I tested the package build and autopkgtest with

  adt-run .// --- qemu adt-utopic-amd64-cloud.img

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/115/rebuild

review: Approve (continuous-integration)

[lp:~pitti/ubuntu-system-settings-online-accounts/py3tests]

122. By Martin Pitt on 2014-05-28

fix verbose option in autopkgtest

[Alberto Mardegan (mardy)]

LGTM, thanks a lot!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-utopic-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/116/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-05-09 08:18:39 +0000
+++ debian/control	2014-05-28 08:08:17 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                pkg-config,
-               python:any (>= 2.7),
+               python3:any,
                libaccounts-qt5-dev,
                libsystemsettings-dev (>= 0.1+13.10.20130806),
                qt5-default,
@@ -85,12 +85,12 @@
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          autopilot-qt5,
          ubuntu-system-settings-online-accounts (>= ${binary:Version}),
          uoa-integration-tests,
          libqt5test5,
-         python-autopilot,
+         python3-autopilot,
 Description: Online Accounts setup for Ubuntu Touch - tests
  Online Accounts setup utility for the Ubuntu Touch System Settings.
  .

=== modified file 'debian/rules'
--- debian/rules	2013-10-17 11:13:28 +0000
+++ debian/rules	2014-05-28 08:08:17 +0000
@@ -18,4 +18,4 @@
 	dh_install --fail-missing
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3

=== modified file 'debian/tests/autopilot'
--- debian/tests/autopilot	2014-05-16 11:04:14 +0000
+++ debian/tests/autopilot	2014-05-28 08:08:17 +0000
@@ -2,5 +2,5 @@
 
 set -e
 
-dbus-launch --exit-with-session xvfb-run -s '-screen 0 1024x768x24' autopilot run online_accounts_ui
+autopilot3-sandbox-run -a '-v' online_accounts_ui
 

=== modified file 'debian/tests/control'
--- debian/tests/control	2014-05-16 11:04:14 +0000
+++ debian/tests/control	2014-05-28 08:08:17 +0000
@@ -1,3 +1,3 @@
 Tests: autopilot
-Depends: @, autopilot-desktop-legacy, dbus-x11, xvfb
+Depends: @, autopilot-desktop (>= 1.5.0+14.10.20140526), python3-evdev, dbus-x11, xvfb
 Restrictions: allow-stderr

=== modified file 'tests/autopilot/autopilot.pro'
--- tests/autopilot/autopilot.pro	2013-09-25 11:38:44 +0000
+++ tests/autopilot/autopilot.pro	2014-05-28 08:08:17 +0000
@@ -2,6 +2,6 @@
 
 TEMPLATE = aux
 
-autopilot.path = $${INSTALL_PREFIX}/lib/python2.7/dist-packages/
+autopilot.path = $${INSTALL_PREFIX}/lib/python3/dist-packages/
 autopilot.files = online_accounts_ui
 INSTALLS = autopilot

=== modified file 'tests/autopilot/online_accounts_ui/emulators/items.py'
--- tests/autopilot/online_accounts_ui/emulators/items.py	2013-09-25 11:38:44 +0000
+++ tests/autopilot/online_accounts_ui/emulators/items.py	2014-05-28 08:08:17 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013 Canonical Ltd.

=== modified file 'tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py'
--- tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py	2014-05-16 11:04:23 +0000
+++ tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py	2014-05-28 08:08:17 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013 Canonical Ltd.