Merge lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager into lp:webbrowser-app/staging

[Andrew Hayzen]

* Add qtdeclarative5-ubuntu-content1 and qtdeclarative5-ubuntu-download-manager0.1 as depends as they are in main and then fixes issues with saving images
* Enable autopilot TestDownloads on desktop as depends are now met

* Add qtdeclarative5-ubuntu-content1 and qtdeclarative5-ubuntu-download-manager0.1 as depends as they are in main and then fixes issues with saving images
* Enable autopilot TestDownloads on desktop as depends are now met

[Olivier Tilloy (osomon)]

Please keep the list of dependencies alphabetically sorted.

Please add those two runtime deps to webapp-container as well. The fact that shared QML files are being installed by the webbrowser-app package is an implementation detail that might not hold true forever, so having the dependencies list explicitly is more future-proof.

review: Needs Fixing

[lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager]

1565. By Andrew Hayzen on 2016-10-31

* Fixed alphabetical ordering
* Added depends to webapp-container

[Andrew Hayzen (ahayzen)]

Fixed the alphabetical ordering and added webapp-container deps, please retest :-)

[lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager]

1566. By Andrew Hayzen on 2016-10-31

* Enable TestDownloads on desktop as depends are now met

[Olivier Tilloy (osomon)]

webbrowser_app.tests.test_downloads.TestDownloads.test_picker reliably fails on my desktop, most likely because there’s no app installed that can handle the application/pdf mimetype.
Ideally this should be mocked in contenthub so that the test can always be run with predictable results. If not possible, please make it conditional (or remove it altogether, are we guaranteed to have a pdf reader application always installed on touch devices?).

review: Needs Fixing

[lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager]

1567. By Andrew Hayzen on 2016-11-03

* Run content-hub-peer-hook-wrapper in the setup for the test_picker test, to ensure that test peers are registered
* Add content-hub-testability as a depends for webbrowser-app autopilot

1568. By Andrew Hayzen on 2016-11-03

* Merge of lp:webbrowser-app/staging

1569. By Andrew Hayzen on 2016-11-03

* Reduce diff

[Andrew Hayzen (ahayzen)]

Updated this to use content-hub-testability (note you'll need to install the package). And to ensure that the test peer has been registered before the test, in the setUp it runs /usr/lib/*/content-hub/content-hub-peer-hook-wrapper.

Please retest :-)

[lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager]

1570. By Andrew Hayzen on 2016-11-03

* Use UITK autopilot helper to get the arch triplet for finding content-hub-peer-hook-wrapper

[Olivier Tilloy (osomon)]

It looks like subprocess.run(…) is a recent addition to the subprocess module, it’s not available on my arale’s python3:

phablet@ubuntu-phablet:~$ python3 -c "import subprocess; subprocess.run"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
AttributeError: 'module' object has no attribute 'run'

review: Needs Fixing

[lp:~ahayzen/webbrowser-app/fix-1491279-depend-on-download-manager]

1571. By Andrew Hayzen on 2016-11-03

* Use check_call instead of run from subprocess as this was added in Python 3.5 and isn't on devices

[Andrew Hayzen (ahayzen)]

Updated to use check_call, please retest :-)

[Olivier Tilloy (osomon)]

LGTM now, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-10-27 08:21:44 +0000
+++ debian/control	2016-11-03 18:00:54 +0000
@@ -53,6 +53,8 @@
          qml-module-qtquick-layouts,
          qml-module-qtquick-window2 (>= 5.3),
          qml-module-ubuntu-web (= ${binary:Version}),
+         qtdeclarative5-ubuntu-content1,
+         qtdeclarative5-ubuntu-download-manager0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-unity-action-plugin,
 Replaces: webbrowser-app-assets,
@@ -76,6 +78,8 @@
          qml-module-qtquick-window2 (>= 5.3),
          qml-module-ubuntu-onlineaccounts,
          qml-module-ubuntu-web (= ${binary:Version}),
+         qtdeclarative5-ubuntu-content1,
+         qtdeclarative5-ubuntu-download-manager0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-unity-action-plugin,
          unity-webapps-qml,
@@ -164,6 +168,7 @@
 Multi-Arch: foreign
 Depends: ${misc:Depends},
          autopilot-qt5,
+         content-hub-testability,
          python3-autopilot,
          python3-fixtures,
          python3-psutil,

=== modified file 'tests/autopilot/webbrowser_app/tests/test_downloads.py'
--- tests/autopilot/webbrowser_app/tests/test_downloads.py	2016-11-03 13:09:29 +0000
+++ tests/autopilot/webbrowser_app/tests/test_downloads.py	2016-11-03 18:00:54 +0000
@@ -21,11 +21,12 @@
 
 from testtools.matchers import Equals
 
+import ubuntuuitoolkit as uitk
+
+import subprocess
 import testtools
 
 
[e-mail](model() == "Desktop", "Don't run on desktop, as "
-                                        "dependencies aren't guaranteed")
 class TestDownloads(StartOpenRemotePageTestCaseBase):
 
     def test_open_close_downloads_page(self):
@@ -60,14 +61,6 @@
         self.assertThat(options_dialog.visible, Eventually(Equals(True)))
         self.main_window.click_cancel_download_button()
 
-    def test_picker(self):
-        self.main_window.go_to_url(self.base_url + "/downloadpdf")
-        options_dialog = self.main_window.get_download_options_dialog()
-        self.assertThat(options_dialog.visible, Eventually(Equals(True)))
-        self.main_window.click_choose_app_button()
-        picker = self.main_window.get_peer_picker()
-        self.assertThat(picker.visible, Eventually(Equals(True)))
-
     def test_download(self):
         self.main_window.go_to_url(self.base_url + "/downloadpdf")
         options_dialog = self.main_window.get_download_options_dialog()
@@ -111,3 +104,26 @@
         # Check that there are no entries in the public downloads window
         entries = public_downloads_page.get_download_entries()
         self.assertThat(len(entries), Equals(0))
+
+
+class TestDownloadsWithContentHubTestability(StartOpenRemotePageTestCaseBase):
+    def setUp(self):
+        # Run content-hub-peer-hook-wrapper which ensures that
+        # content-hub-testability has been register for the ContentPeersModel
+
+        # Find arch path of content-hub-peer-hook-wrapper
+        path = ("/usr/lib/%s/content-hub/content-hub-peer-hook-wrapper" %
+                uitk.base.get_host_multiarch())
+
+        return_code = subprocess.check_call([path])
+        self.assertThat(return_code, Equals(0))
+
+        super(TestDownloadsWithContentHubTestability, self).setUp()
+
+    def test_picker(self):
+        self.main_window.go_to_url(self.base_url + "/downloadpdf")
+        options_dialog = self.main_window.get_download_options_dialog()
+        self.assertThat(options_dialog.visible, Eventually(Equals(True)))
+        self.main_window.click_choose_app_button()
+        picker = self.main_window.get_peer_picker()
+        self.assertThat(picker.visible, Eventually(Equals(True)))