webbrowser-app

Merge lp:~canonical-platform-qa/webbrowser-app/fix_base_class into lp:webbrowser-app

fix_base_class
Merge into trunk

Proposed by Leo Arias on 2015-04-16

Status:	Merged
Approved by:	Olivier Tilloy on 2015-05-08
Approved revision:	970
Merged at revision:	1004
Proposed branch:	lp:~canonical-platform-qa/webbrowser-app/fix_base_class
Merge into:	lp:webbrowser-app
Diff against target:	107 lines (+29/-24) 3 files modified tests/autopilot/webbrowser_app/__init__.py (+25/-1) tests/autopilot/webbrowser_app/emulators/browser.py (+1/-18) tests/autopilot/webbrowser_app/tests/__init__.py (+3/-5)
To merge this branch:	bzr merge lp:~canonical-platform-qa/webbrowser-app/fix_base_class
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2015-04-16	Approve on 2015-05-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-07
Christopher Lee (community)		2015-05-06	Approve on 2015-05-07
Review via email: mp+256519@code.launchpad.net

Commit Message

Fix the base class used when launching the app in autopilot tests.

Description of the Change

Using the common base class from the toolkit simplifies the inheritance of autopilot custom proxy objects. The tests are the same, but this allows us to make some changes on the autopilot registry.

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

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

review: Approve (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-04-27:

LGTM.

review: Approve

Olivier Tilloy (osomon) wrote on 2015-05-06:

Un-approving. On my desktop, this breaks running one single test case. Running all test cases in one given file/class still works, but passing the fully-qualified name of a test case (e.g. webbrowser_app.tests.test_tabs.TestTabsView.test_switch_tabs) to `autopilot3 run` fails with the following error:

Traceback (most recent call last):
  File "/home/osomon/dev/phablet/browser/webbrowser-app/tests/autopilot/webbrowser_app/tests/test_tabs.py", line 36, in setUp
    super(TestTabsView, self).setUp()
  File "/home/osomon/dev/phablet/browser/webbrowser-app/tests/autopilot/webbrowser_app/tests/__init__.py", line 188, in setUp
    self.assert_home_page_eventually_loaded()
  File "/home/osomon/dev/phablet/browser/webbrowser-app/tests/autopilot/webbrowser_app/tests/__init__.py", line 191, in assert_home_page_eventually_loaded
    self.main_window.wait_until_page_loaded(self.url)
  File "/home/osomon/dev/phablet/browser/webbrowser-app/tests/autopilot/webbrowser_app/tests/__init__.py", line 109, in main_window
    return self.app.main_window
  File "/usr/lib/python3/dist-packages/autopilot/introspection/dbus.py", line 416, in __getattr__
    (self.__class__.__name__, name))
AttributeError: Class 'webbrowser-app' has no attribute 'main_window'.

review: Needs Fixing

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

That is a great catch, thanks!

Looking at this example, now I think that the top of the namespace should declare all the custom proxy objects that it exports, forcing them to get into the autopilot registry every time the package is imported.

I pushed a new version.

I'll add veebers to the reviewers to get his opinion.

lp:~canonical-platform-qa/webbrowser-app/fix_base_class updated on 2015-05-06

970. By Leo Arias on 2015-05-06: Merged with trunk.

Christopher Lee (veebers) wrote on 2015-05-07:

My opinion is that autopilot shouldn't make it so you need to do a work around like this :-) Rest assured that this is a topic of discussion within the team and we hope to improve the story around that.

That being said this seems like a reasonable work around.

review: Approve

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-05-08:

Looks good to me now. Thanks!

review: Approve

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

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file 'tests/autopilot/webbrowser_app/__init__.py'
 --- tests/autopilot/webbrowser_app/__init__.py	2014-02-06 04:31:01 +0000
 +++ tests/autopilot/webbrowser_app/__init__.py	2015-05-06 22:38:21 +0000
@@ -1,6 +1,6 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+ #
--# Copyright 2013 Canonical
++# Copyright 2013-2015 Canonical
+ #
  # This program is free software: you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 3, as published
@@ -15,3 +15,27 @@
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
  """webbrowser-app autopilot tests and emulators - top level package."""
++
++
++import ubuntuuitoolkit as uitk
++
++from autopilot import introspection
++
++from webbrowser_app.emulators import browser
++
++
++class Webbrowser(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot custom proxy object for the webbrowser app."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'webbrowser-app':
++            if state['applicationName'][1] == 'webbrowser-app':
++                return True
++        return False
++
++    @property
++    def main_window(self):
++        return self.select_single(browser.Browser)
 === modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
 --- tests/autopilot/webbrowser_app/emulators/browser.py	2015-04-22 10:25:42 +0000
 +++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-05-06 22:38:21 +0000
@@ -18,24 +18,7 @@
  import autopilot.logging
  import ubuntuuitoolkit as uitk
--from autopilot import introspection
--
--
--class Webbrowser(uitk.UbuntuUIToolkitCustomProxyObjectBase):
--
--    """Autopilot custom proxy object for the webbrowser app."""
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'webbrowser-app':
--            if state['applicationName'][1] == 'webbrowser-app':
--                return True
--        return False
--
--    @property
--    def main_window(self):
--        return self.select_single(Browser)
++
  logger = logging.getLogger(__name__)
 === modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
 --- tests/autopilot/webbrowser_app/tests/__init__.py	2015-03-31 16:13:25 +0000
 +++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-05-06 22:38:21 +0000
@@ -31,8 +31,6 @@
  import ubuntuuitoolkit as uitk
--from webbrowser_app.emulators import browser
--
  class BrowserTestCaseBase(AutopilotTestCase):
@@ -62,21 +60,21 @@
          return self.launch_test_application(
              self.local_location,
              *self.ARGS,
--            emulator_base=browser.Webbrowser)
++            emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase)
      def launch_test_installed(self):
          if model() == 'Desktop':
              return self.launch_test_application(
                  "webbrowser-app",
                  *self.ARGS,
--                emulator_base=browser.Webbrowser)
++                emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase)
          else:
              return self.launch_test_application(
                  "webbrowser-app",
                  self.d_f,
                  *self.ARGS,
                  app_type='qt',
--                emulator_base=browser.Webbrowser)
++                emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase)
      def clear_datadir(self):
          datadir = os.path.join(os.path.expanduser("~"), ".local", "share",