Merge lp:~xnox/notes-app/py32 into lp:notes-app

[Dimitri John Ledkov]

Make autopilot tests python 3 and 2 compatible.

Make autopilot tests python 3 and 2 compatible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:250
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/~xnox/notes-app/py32/+merge/210254/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/notes-app-ci/275/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3805
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5743
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4627

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/275/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/notes-app-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3820
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5755
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4640

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/276/rebuild

review: Approve (continuous-integration)

[lp:~xnox/notes-app/py32]

251. By Dimitri John Ledkov on 2014-04-10

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/notes-app-ci/294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4731
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4143/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4860
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4314/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6378/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5885

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/294/rebuild

review: Needs Fixing (continuous-integration)

[lp:~xnox/notes-app/py32]

252. By Dimitri John Ledkov on 2014-04-10

Mark autopilot tests as python3 compatible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/notes-app-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4737
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4144/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4090
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4866
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4866/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4320
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4320/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6379/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5892

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/295/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/notes-app-ci/297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5391
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4839
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4839/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6509
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6652

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/297/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-08 22:42:33 +0000
+++ CMakeLists.txt	2014-04-10 10:39:03 +0000
@@ -41,6 +41,7 @@
 include(GNUInstallDirs)
 
 set(NOTES_APP notes-app)
+set(AUTOPILOT_DIR notes_app)
 
 if(NOT CLICK_MODE)
     set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-03-14 17:06:41 +0000
+++ click/manifest.json.in	2014-04-10 10:39:03 +0000
@@ -17,5 +17,8 @@
     "x-source": {
         "vcs-bzr": "lp:notes-app", 
         "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+    "x-test": {
+	"autopilot": "@AUTOPILOT_DIR@"
     }
 }

=== modified file 'debian/control'
--- debian/control	2013-09-26 17:55:31 +0000
+++ debian/control	2014-04-10 10:39:03 +0000
@@ -4,13 +4,15 @@
 XSBC-Original-Maintainer: Ugo Riboni <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               python (>= 2.7),
+               python3,
+               dh-python,
                qtbase5-dev,
                qtdeclarative5-dev,
                dh-translations,
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://launchpad.net/notes-app
+X-Python3-Versions: >= 3.2
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
 # just go ahead. ~phablet-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/notes-app/trunk
@@ -36,7 +38,8 @@
          libqt5widgets5,
          ubuntu-ui-toolkit-autopilot,
          notes-app (>= ${binary:Version}),
-         python2.7,
+         python3-autopilot,
+         ${python3:Depends},
          ${misc:Depends},
 Description: Test package for the notes app
  notes-app is a note taking application for the Ubuntu platform. This package

=== modified file 'debian/rules'
--- debian/rules	2013-10-08 09:52:53 +0000
+++ debian/rules	2014-04-10 10:39:03 +0000
@@ -11,7 +11,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --parallel --with translations
+	dh $@ --parallel --with translations,python3
 
 override_dh_install:
 	dh_install --fail-missing
@@ -21,3 +21,6 @@
 	# Unfortunately, the default build directory is not exposed
 	# (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
 	$(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) com.ubuntu.notes.pot
+
+override_dh_python3:
+	dh_python3 -pnotes-app-autopilot

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2013-09-23 13:47:21 +0000
+++ tests/autopilot/CMakeLists.txt	2014-04-10 10:39:03 +0000
@@ -1,6 +1,4 @@
-set(AUTOPILOT_DIR notes_app)
-
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 if(INSTALL_TESTS)

=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
--- tests/autopilot/notes_app/tests/__init__.py	2013-12-11 17:29:27 +0000
+++ tests/autopilot/notes_app/tests/__init__.py	2014-04-10 10:39:03 +0000
@@ -6,12 +6,19 @@
 # by the Free Software Foundation.
 
 """notes-app autopilot tests."""
+from __future__ import print_function, absolute_import
 
 import base64
-import BaseHTTPServer
+try:
+    from http import server
+except ImportError:
+    import BaseHTTPServer as server
 import errno
 import glob
-import md5
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
 import os
 import os.path
 import socket
@@ -26,7 +33,7 @@
 from ubuntuuitoolkit.emulators import UbuntuUIToolkitEmulatorBase
 
 from notes_app.emulators.notesapp import NotesApp
-import imagedata
+from . import imagedata
 
 
 class NotesAppTestCase(AutopilotTestCase):
@@ -99,7 +106,7 @@
 
     def ensure_db(self):
         path = os.path.expanduser("~/.local/share/com.ubuntu.notes/Databases")
-        db = os.path.join(path, md5.md5("notes").hexdigest() + ".sqlite")
+        db = os.path.join(path, md5(b"notes").hexdigest() + ".sqlite")
         if not os.path.exists(db):
             self.launch_and_quit_app()
         self.assertTrue(os.path.exists(db))
@@ -139,7 +146,7 @@
 
 
 
-class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class HTTPRequestHandler(server.BaseHTTPRequestHandler):
 
     """
     A custom HTTP request handler that serves GET resources.
@@ -182,14 +189,14 @@
         self.server = None
         while (self.server is None) and (port < 12350):
             try:
-                self.server = BaseHTTPServer.HTTPServer(("", port),
-                                                        HTTPRequestHandler)
+                self.server = server.HTTPServer(("", port),
+                                                HTTPRequestHandler)
             except socket.error as error:
                 if (error.errno == errno.EADDRINUSE):
-                    print "Port %d is already in use" % port
+                    print("Port %d is already in use" % port)
                     port += 1
                 else:
-                    print os.strerror(error.errno)
+                    print(os.strerror(error.errno))
                     raise
         if self.server is None:
             raise SystemError("Unable to start local HTTP server")
@@ -200,7 +207,7 @@
         return self.server.server_port
 
     def run(self):
-        print "now serving on port %d" % self.port
+        print("now serving on port %d" % self.port)
         self.server.serve_forever()
 
     def shutdown(self):