Merge lp:~barry/sudoku-app/py3autopilot into lp:sudoku-app

[Barry Warsaw]

Port autopilot tests to Python 3. Bump Standards-Version to 3.9.5.

Port autopilot tests to Python 3.
Bump Standards-Version to 3.9.5

[Dinko Osmankovic (dinko-metalac)]

It goes through with me. Can we also check this with jenkins?

[Dimitri John Ledkov (xnox)]

Strange that it didn't run yet. Manually probing bot review.

[Dinko Osmankovic (dinko-metalac)]

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-03-13 20:32:31 +0000
+++ debian/control	2014-05-01 23:18:28 +0000
@@ -4,7 +4,7 @@
 Maintainer: Dinko Osmankovic <[e-mail]>
 Build-Depends: debhelper (>= 9),
                gettext,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://launchpad.net/sudoku-app
 Vcs-Bzr: https://code.launchpad.net/~sudoku-touch-dev/sudoku-app/trunk
 
@@ -19,7 +19,7 @@
          qtdeclarative5-particles-plugin,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-	 qtdeclarative5-usermetrics0.1,
+         qtdeclarative5-usermetrics0.1,
 Description: Sudoku game for Ubuntu devices
  Simple Sudoku Touch game written in QML2/JS using Ubuntu SDK
 
@@ -28,6 +28,7 @@
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
          ubuntu-ui-toolkit-autopilot,
+         python3-autopilot,
          sudoku-app (= ${source:Version})
 Description: Autopilot UI tests for sudoku game for Ubuntu devices
  This package contains the autopilot tests for the Sudoku App
 
=== modified file 'debian/sudoku-app-autopilot.install'
--- debian/sudoku-app-autopilot.install	2013-07-12 20:05:03 +0000
+++ debian/sudoku-app-autopilot.install	2014-05-01 23:18:28 +0000
@@ -1,1 +1,1 @@
-tests/autopilot/sudoku_app/* usr/lib/python2.7/dist-packages/sudoku_app/
+tests/autopilot/sudoku_app/* usr/lib/python3/dist-packages/sudoku_app/
 
=== modified file 'manifest.json'
--- manifest.json	2014-04-14 22:44:21 +0000
+++ manifest.json	2014-05-01 23:18:28 +0000
@@ -12,4 +12,7 @@
     "name": "com.ubuntu.sudoku",
     "title": "Sudoku",
     "version": "1.0"
-}
 \ No newline at end of file
+    "x-test": {
+        "autopilot": "sudoku_app"
+    }
+}
 
=== modified file 'tests/autopilot/sudoku_app/tests/__init__.py'
--- tests/autopilot/sudoku_app/tests/__init__.py	2013-11-04 22:37:12 +0000
+++ tests/autopilot/sudoku_app/tests/__init__.py	2014-05-01 23:18:28 +0000
@@ -7,7 +7,6 @@
 
 """Sudoku app autopilot tests."""
 
-import os.path
 import os
 import shutil
 import logging
 
=== modified file 'tests/autopilot/sudoku_app/tests/test_sudoku.py'
--- tests/autopilot/sudoku_app/tests/test_sudoku.py	2014-03-14 09:35:21 +0000
+++ tests/autopilot/sudoku_app/tests/test_sudoku.py	2014-05-01 23:18:28 +0000
@@ -7,8 +7,6 @@
 
 """Sudoku app autopilot tests."""
 
-from __future__ import absolute_import
-
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
@@ -222,7 +220,8 @@
 
         #select "Moderate" choice of difficulty selector
         choices = self.main_view.get_difficulty_selector_labelvisual()
-        choice_ = filter(lambda choice: choice.text == 'Moderate', choices)[0]
+        choice_ = [choice for choice in choices
+                   if choice.text == 'Moderate'][0]
         self.pointing_device.click_object(choice_)
         self.assertThat(
             lambda:
@@ -237,8 +236,8 @@
 
         #select "Simple" choice of theme selector
         themeChoices = self.main_view.get_theme_selector_labelvisual()
-        themeChoice = filter(lambda choice: choice.text == 'Simple',
-                             themeChoices)[0]
+        themeChoice = [choice for choice in themeChoices
+                       if choice.text == 'Simple'][0]
         self.pointing_device.click_object(themeChoice)
         self.assertThat(
             lambda: