Merge lp:~abreu-alexandre/ubuntu-html5-theme/port-to-python3 into lp:ubuntu-html5-theme

[Alexandre Abreu]

Port AP tests to python3 (blocking all other landings for fixes on the project)

Port AP tests to python3 (blocking all other landings for fixes on the project)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3536/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2931/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3842
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3842/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/146/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3537/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3843/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:175
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/148/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/6
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3845/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/ubuntu-html5-theme/port-to-python3]

171. By Alexandre Abreu on 2014-09-22

make ubuntu-html5-container multi-arch foreign; update dependencies for libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit

172. By Alexandre Abreu on 2014-09-22

add forgotten changelog

173. By Steve Langasek on 2014-09-22

Drop unused dependency on dpkg-dev from ubuntu-html5-container. LP: #1369052. Fixes: 1369052
Approved by: PS Jenkins bot, Alexandre Abreu

174. By PS Jenkins bot on 2014-09-22

Releasing 0.1.2+14.10.20140922.1-0ubuntu1

175. By Jean-Francois Moy on 2014-10-08

Fixed alignment issues. Fixed UI.optionselector being incorrectly documented. Aligned terminology between various pages. Fixed incorrect UI.progress documentation. Fixes: 1276234
Approved by: Alexandre Abreu, PS Jenkins bot, David Barth

176. By PS Jenkins bot on 2014-10-08

Releasing 0.1.2+14.10.20141008-0ubuntu1

177. By Alexandre Abreu on 2014-11-22

Port HTML5 containert to oxide
Approved by: Alexandre Abreu

178. By PS Jenkins bot on 2014-11-22

Releasing 0.1.2+15.04.20141122-0ubuntu1

179. By Alexandre Abreu on 2014-12-10

Add --oxide flag to switch between oxide/webkit; simplify code.

For a smooth transition between the ubuntu-html5-app-launcher and the webapp-container as the new html5 container and to allow for some amount of backward compatibility, this MR makes sure that oxide can be used (part of the qtwebkit removal) with the launcher, and existsing apps can still function.

180. By CI Train Bot Account on 2014-12-10

Releasing 0.1.2+15.04.20141210.1-0ubuntu1

181. By Alexandre Abreu on 2014-12-12

Small fix for new tab/target blank handling

182. By CI Train Bot Account on 2014-12-12

Releasing 0.1.2+15.04.20141212.1-0ubuntu1

183. By Alexandre Abreu on 2014-12-17

Cleanup oxide option and set it as default and only option

184. By CI Train Bot Account on 2014-12-17

Releasing 0.1.2+15.04.20141217-0ubuntu1

185. By David Barth on 2015-01-15

Fix a few small typos in the docs

186. By David Barth on 2015-01-15

Make sure to add the header after it's created

187. By David Barth on 2015-01-15

Remove the strict cordova-2.8 dependency, which is not supported anymore Fixes: #1409656

188. By Alexandre Abreu on 2015-01-15

Meta branch that contains those bug fixes (easier to land):

lp:~daker/ubuntu-html5-theme/fix.1243396
lp:~daker/ubuntu-html5-theme/fix.1294779
lp:~daker/ubuntu-html5-theme/fix.1294993
lp:~daker/ubuntu-html5-theme/fix.1294986
lp:~daker/ubuntu-html5-theme/fix.1216874
lp:~daker/ubuntu-html5-theme/fix.slider

189. By Adnane Belmadiaf on 2015-01-15

Added timer to hide the toolbar Fixes: #1292109, #1293899
Approved by: Alexandre Abreu

190. By CI Train Bot Account on 2015-01-15

Releasing 0.1.2+15.04.20150115.2-0ubuntu1

191. By Alexandre Abreu on 2015-01-21

fixes

=== modified file 'README'
--- README	2014-05-25 18:51:21 +0000
+++ README	2015-01-21 16:41:55 +0000
@@ -26,3 +26,21 @@
 branch folder. Then enter this command to begin watching your scss files:
 $ sass --watch 0.1/ambiance/css/sass/default.scss:0.1/ambiance/css/appTemplate.css --style expanded
 
+Automated UI tests
+==================
+
+The ubuntu-html5 container and the ubuntu-ui-toolkit both use autopilot (https://launchpad.net/autopilot) to test its functional elements.
+
+To run the tests, you will need to install python3-autopilot and libautopilot-qt.
+Then do the following:
+
+    $ cd tests/autopilot/
+    $ autopilot3 run ubuntu_html5_ui_toolkit
+    $ autopilot3 run ubuntu_html5_container
+
+You can get a list of all available tests with the following commands:
+
+    $ autopilot3 list ubuntu_html5_ui_toolkit
+    $ autopilot3 list ubuntu_html5_container
+
+
 
=== modified file 'debian/control'
--- debian/control	2015-01-15 16:20:21 +0000
+++ debian/control	2015-01-21 16:41:55 +0000
@@ -5,8 +5,8 @@
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
                liboxideqt-qmlplugin (>= 1.2.0),
-               python (>= 2.7),
-               python-setuptools,
+               python3-all,
+               python3-setuptools,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
@@ -64,13 +64,13 @@
          libjs-jquery,
          libqt5test5,
          liboxideqt-qmlplugin (>= 1.2.0),
-         python-xlib,
+         python3-xlib,
+         python3-autopilot,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
          ubuntu-html5-ui-toolkit-examples (= ${binary:Version}),
          ${misc:Depends},
-         ${python:Depends},
 Replaces: ubuntu-html5-theme-autopilot (<< 0.1.1),
 Conflicts: ubuntu-html5-theme-autopilot (<< 0.1.1),
 Provides: ubuntu-html5-theme-autopilot,
@@ -89,7 +89,6 @@
          ubuntu-html5-ui-toolkit (= ${source:Version}),
          unity-webapps-qml (>= 0.1+14.04.20131106-0ubuntu2),
          ${misc:Depends},
-         ${python:Depends},
          ${shlibs:Depends},
 Description: Ubuntu HTML5 QML container component for HTML5 touch apps.
  This package contains the Ubuntu HTML5 QML component used to embed HTML5
@@ -102,8 +101,8 @@
          liboxideqt-qmlplugin (>= 1.2.0),
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-container (>= ${binary:Version}),
+         python3-autopilot,
          ${misc:Depends},
-         ${python:Depends},
 Description: Autopilot tests for the Ubuntu HTML5 QML container component for HTML5 touch apps.
  This package contains the Ubuntu HTML5 QML component used to embed HTML5
  apps at runtime. This package contains the autopilot tests.
 
=== modified file 'debian/ubuntu-html5-container-autopilot.install'
--- debian/ubuntu-html5-container-autopilot.install	2014-02-06 22:51:33 +0000
+++ debian/ubuntu-html5-container-autopilot.install	2015-01-21 16:41:55 +0000
@@ -1,1 +1,1 @@
-usr/lib/python*/dist-packages/ubuntu_html5_container/*
+usr/lib/python3/dist-packages/ubuntu_html5_container/*
 
=== modified file 'debian/ubuntu-html5-ui-toolkit-autopilot.install'
--- debian/ubuntu-html5-ui-toolkit-autopilot.install	2014-02-11 05:21:31 +0000
+++ debian/ubuntu-html5-ui-toolkit-autopilot.install	2015-01-21 16:41:55 +0000
@@ -1,2 +1,2 @@
-usr/lib/python*/dist-packages/ubuntu_html5_ui_toolkit/*
+usr/lib/python3/dist-packages/ubuntu_html5_ui_toolkit/*
 usr/share/ubuntu-html5-ui-toolkit/tests
 
=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-02-11 05:21:31 +0000
+++ tests/autopilot/CMakeLists.txt	2015-01-21 16:41:55 +0000
@@ -1,4 +1,4 @@
-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)
 
 install(DIRECTORY ubuntu_html5_container ubuntu_html5_ui_toolkit
 
=== added file 'tests/autopilot/tools/qml/message-server.js'
--- tests/autopilot/tools/qml/message-server.js	1970-01-01 00:00:00 +0000
+++ tests/autopilot/tools/qml/message-server.js	2015-01-21 16:41:55 +0000
@@ -0,0 +1,29 @@
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+oxide.addMessageHandler("EVALUATE-CODE", function(msg) {
+    var code = msg.args.code;
+    if (msg.args.wrap) {
+        code = "(function() {" + code + "})()";
+    }
+    try {
+        var result = eval(code);
+        msg.reply({result: result});
+    } catch(e) {
+        msg.error("Code threw exception: \"" + e + "\"");
+    }
+});
+
 
=== modified file 'tests/autopilot/tools/qml/webview.qml'
--- tests/autopilot/tools/qml/webview.qml	2014-11-19 18:36:44 +0000
+++ tests/autopilot/tools/qml/webview.qml	2015-01-21 16:41:55 +0000
@@ -72,7 +72,8 @@
 
     function evalInPageUnsafe(expr) {
         var result = webview.evaluateCode(expr, true);
-        root.resultUpdated(result.toString())
+        console.log('result: ' + result)
+        root.resultUpdated(result ? result.toString() : result)
     }
 
     function clickAnyElementBySelector(selector) {
 
=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2014-11-19 18:36:44 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2015-01-21 16:41:55 +0000
@@ -200,7 +200,7 @@
     def eval_expression_in_page_unsafe(self, expr):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
-        result = webview.slots.evalInPageUnsafe(expr)
+        webview.slots.evalInPageUnsafe(expr)
         self.assertThat(
             lambda: self.watcher.num_emissions,
             Eventually(GreaterThan(prev_emissions)))