Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher into lp:ubuntu-ui-toolkit/staging

register_url_dispatcher
Merge into staging

Proposed by Leo Arias on 2015-06-03

Status:	Merged
Approved by:	Zsombor Egri on 2015-06-09
Approved revision:	1533
Merged at revision:	1529
Proposed branch:	lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	223 lines (+119/-4) 4 files modified debian/control (+1/-0) tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+45/-1) tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml (+30/-0) tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py (+43/-3)
To merge this branch:	bzr merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-06-09
Zsombor Egri		2015-06-03	Approve on 2015-06-09
Review via email: mp+260923@code.launchpad.net

Commit message

Add url protocols to the fake application.
Adds a dependency to url-dispatcher-tools in ubuntu-ui-toolkit-autopilot.

lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher updated on 2015-06-03

1528. By Leo Arias on 2015-06-03: added the bug.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

FAILED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1846/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3062/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/574/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/576/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/573/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3060/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1846/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

FAILED: Continuous integration, rev:1528
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1847/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3063/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/575/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/577/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/574/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3061/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1847/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher updated on 2015-06-03

1529. By Leo Arias on 2015-06-03: Fixed pep8.
1530. By Leo Arias on 2015-06-03: Added the missing file.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1849/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

FAILED: Continuous integration, rev:1530
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1853/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3073/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/583/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/580/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3071/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1853/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher updated on 2015-06-04

1531. By Leo Arias on 2015-06-04: Add the copyright.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1856/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher updated on 2015-06-05

1532. By Leo Arias on 2015-06-05: Use ubuntu-app-pid.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1863/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher updated on 2015-06-08

1533. By Leo Arias on 2015-06-08: Convert to int.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1869/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1870/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-06-09:

One obs. inline.

review: Needs Information

Revision history for this message

Leo Arias (elopio) wrote on 2015-06-09:

Replied. Thanks for checking zsombi.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-06-09:

Ok, approved then. I mixed with the uri-handler functionality.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-06-09:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Canonical Platform QA Team

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'debian/control'
 --- debian/control	2015-06-02 11:38:57 +0000
 +++ debian/control	2015-06-08 23:01:09 +0000
@@ -149,6 +149,7 @@
           qttestability-autopilot,
           ubuntu-ui-toolkit-examples (>= ${source:Version}),
           upstart,
++         url-dispatcher-tools,
           qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
           qml-module-qttest | qtdeclarative5-test-plugin,
  Description: Test package for Ubuntu UI Toolkit
 === modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
 --- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-06-01 15:25:19 +0000
 +++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-06-08 23:01:09 +0000
@@ -15,9 +15,11 @@
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
  import copy
++import json
  import logging
  import os
  import shutil
++import subprocess
  import tempfile
  import fixtures
@@ -56,18 +58,24 @@
      def __init__(
              self, qml_file_contents=DEFAULT_QML_FILE_CONTENTS,
--            desktop_file_dict=None):
++            desktop_file_dict=None, url_dispatcher_protocols=None):
          super().__init__()
          self._qml_file_contents = qml_file_contents
          if desktop_file_dict is None:
              self._desktop_file_dict = copy.deepcopy(DEFAULT_DESKTOP_FILE_DICT)
          else:
              self._desktop_file_dict = copy.deepcopy(desktop_file_dict)
++        self.url_dispatcher_protocols = url_dispatcher_protocols
      def setUp(self):
          super().setUp()
          self.qml_file_path, self.desktop_file_path = (
              self._create_test_application())
++        desktop_file_name = os.path.basename(self.desktop_file_path)
++        self.application_name, _ = os.path.splitext(desktop_file_name)
++        if self.url_dispatcher_protocols:
++            self.url_dispatcher_file_path = (
++                self._register_url_dispatcher_protocols(self.application_name))
      def _create_test_application(self):
          qml_file_path = self._write_test_qml_file()
@@ -111,6 +119,42 @@
          return os.path.join(
              os.environ.get('HOME'), '.local', 'share', 'applications')
++    def _register_url_dispatcher_protocols(self, application_name):
++        url_dispatcher_file_path = self._write_url_dispatcher_file(
++            application_name)
++        self.addCleanup(os.remove, url_dispatcher_file_path)
++        self._update_url_dispatcher_directory(url_dispatcher_file_path)
++        return url_dispatcher_file_path
++
++    def _write_url_dispatcher_file(self, application_name):
++        url_dispatcher_dir = self._get_local_url_dispatcher_directory()
++        if not os.path.exists(url_dispatcher_dir):
++            os.makedirs(url_dispatcher_dir)
++
++        protocol_list = [
++            {'protocol': protocol}
++            for protocol in self.url_dispatcher_protocols]
++
++        url_dispatcher_file_path = os.path.join(
++            url_dispatcher_dir, application_name + '.url-dispatcher')
++        with open(url_dispatcher_file_path, 'w') as url_dispatcher_file:
++            url_dispatcher_file.write(json.dumps(protocol_list))
++
++        return url_dispatcher_file_path
++
++    def _get_local_url_dispatcher_directory(self):
++        return os.path.join(
++            os.environ.get('HOME'), '.config', 'url-dispatcher', 'urls')
++
++    def _update_url_dispatcher_directory(self, url_dispatcher_file_path):
++        # FIXME This should be updated calling
++        # initctl start url-dispatcher-update-user, but it is not working.
++        # https://bugs.launchpad.net/ubuntu/+source/url-dispatcher/+bug/1461496
++        # --elopio - 2015-06-02
++        subprocess.check_output(
++            '/usr/lib/*/url-dispatcher/update-directory ' +
++            url_dispatcher_file_path, shell=True)
++
  class InitctlEnvironmentVariable(fixtures.Fixture):
      """Set the value of initctl environment variables."""
 === added file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml	2015-06-08 23:01:09 +0000
@@ -0,0 +1,30 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program 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; version 3.
++ *
++ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.3
++import Ubuntu.Components 1.2
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++    objectName: "mainView"
++
++    Label {
++        id: label
++        objectName: 'testLabel'
++        text: 'Test application.'
++    }
++}
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2015-06-01 15:25:19 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2015-06-08 23:01:09 +0000
@@ -15,6 +15,7 @@
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
  import os
++import subprocess
  import tempfile
  from unittest import mock
@@ -22,6 +23,7 @@
  import testtools
  from autopilot import (
      display,
++    introspection,
      platform,
      testcase as autopilot_testcase
+ )
@@ -140,7 +142,8 @@
              os.path.dirname(fake_application.desktop_file_path))
      def test_fake_application_files_must_be_removed_after_test(self):
--        fake_application = fixture_setup.FakeApplication()
++        fake_application = fixture_setup.FakeApplication(
++            url_dispatcher_protocols=['testprotocol'])
          def inner_test():
              class TestWithFakeApplication(testtools.TestCase):
@@ -151,6 +154,8 @@
          inner_test().run()
          self.assertThat(fake_application.qml_file_path, Not(FileExists()))
          self.assertThat(fake_application.desktop_file_path, Not(FileExists()))
++        self.assertThat(
++            fake_application.url_dispatcher_file_path, Not(FileExists()))
  class LaunchFakeApplicationTestCase(autopilot_testcase.AutopilotTestCase):
@@ -159,7 +164,7 @@
          fake_application = fixture_setup.FakeApplication()
          self.useFixture(fake_application)
--        self.application = self.launch_test_application(
++        application = self.launch_test_application(
              base.get_qmlscene_launch_command(),
              fake_application.qml_file_path,
              '--desktop_file_hint={0}'.format(
@@ -167,7 +172,42 @@
              app_type='qt')
          # We can select a component from the application.
--        self.application.select_single('Label', objectName='testLabel')
++        application.select_single('Label', objectName='testLabel')
++
++    def test_launch_fake_application_from_url_dispatcher(self):
++        if platform.model() == 'Desktop':
++            self.skipTest('Not yet working on desktop')
++
++        path = os.path.abspath(__file__)
++        dir_path = os.path.dirname(path)
++        qml_file_path = os.path.join(
++            dir_path, 'test_fixture_setup.LaunchFakeApplicationTestCase.qml')
++        with open(qml_file_path) as qml_file:
++            qml_file_contents = qml_file.read()
++
++        fake_application = fixture_setup.FakeApplication(
++            qml_file_contents=qml_file_contents,
++            url_dispatcher_protocols=['testprotocol'])
++        self.useFixture(fake_application)
++
++        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
++            QT_LOAD_TESTABILITY=1))
++
++        self.addCleanup(
++            subprocess.check_output,
++            ['ubuntu-app-stop', fake_application.application_name])
++
++        subprocess.check_output(
++            ['url-dispatcher', 'testprotocol://test'])
++
++        pid = int(subprocess.check_output(
++            ['ubuntu-app-pid', fake_application.application_name]).strip())
++
++        application = introspection.get_proxy_object_for_existing_process(
++            pid=pid)
++
++        # We can select a component from the application.
++        application.select_single('Label', objectName='testLabel')
  class InitctlEnvironmentVariableTestCase(testtools.TestCase):

Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/register_url_dispatcher into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers