webbrowser-app

Merge lp:~osomon/webbrowser-app/fix-ap-activity-view into lp:webbrowser-app

  1. fix-ap-activity-view
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 328
Merged at revision: 332
Proposed branch: lp:~osomon/webbrowser-app/fix-ap-activity-view
Merge into: lp:webbrowser-app
Diff against target: 42 lines (+8/-3)
2 files modified
tests/autopilot/webbrowser_app/emulators/browser.py (+6/-1)
tests/autopilot/webbrowser_app/tests/test_tabs.py (+2/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/fix-ap-activity-view
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Omer Akram (community) Approve
Review via email: mp+187038@code.launchpad.net

Commit message

When the activity view cannot be found, return None instead of raising an exception, as that’s what tests expect.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/380/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3843/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/263
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/263
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3855/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1373
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1373/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1166

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

looks good, just a small comment:

35 Eventually(Not(Is(None))))

Why not just use IsNot

review: Needs Information
Revision history for this message
Olivier Tilloy (osomon) wrote :

> looks good, just a small comment:
>
> 35 Eventually(Not(Is(None))))
>
> Why not just use IsNot

As far as I know there is not IsNot matcher:

    $ python -c "from testtools.matchers import IsNot"
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
    ImportError: cannot import name IsNot

Revision history for this message
Omer Akram (om26er) wrote :

woops

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/382/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/265
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3861
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3861/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1172

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/266
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3932
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3932/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1233

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
2--- tests/autopilot/webbrowser_app/emulators/browser.py 2013-08-29 16:28:44 +0000
3+++ tests/autopilot/webbrowser_app/emulators/browser.py 2013-09-23 14:41:28 +0000
4@@ -5,6 +5,8 @@
5 # under the terms of the GNU General Public License version 3, as published
6 # by the Free Software Foundation.
7
8+from autopilot.introspection.dbus import StateNotFoundError
9+
10 from ubuntuuitoolkit import emulators as uitk
11
12
13@@ -69,7 +71,10 @@
14 return listview.get_children()[0].get_children_by_type("Base")
15
16 def get_activity_view(self):
17- return self.select_single("ActivityView")
18+ try:
19+ return self.select_single("ActivityView")
20+ except StateNotFoundError:
21+ return None
22
23 def get_tabslist(self):
24 return self.get_activity_view().select_single("TabsList")
25
26=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
27--- tests/autopilot/webbrowser_app/tests/test_tabs.py 2013-08-29 16:28:44 +0000
28+++ tests/autopilot/webbrowser_app/tests/test_tabs.py 2013-09-23 14:41:28 +0000
29@@ -20,11 +20,11 @@
30 """Tests tabs management."""
31
32 def assert_activity_view_eventually_visible(self):
33- self.assertThat(lambda: self.main_window.get_activity_view(),
34+ self.assertThat(self.main_window.get_activity_view,
35 Eventually(Not(Is(None))))
36
37 def assert_activity_view_eventually_hidden(self):
38- self.assertThat(lambda: self.main_window.get_activity_view(),
39+ self.assertThat(self.main_window.get_activity_view,
40 Eventually(Is(None)))
41
42 def ensure_activity_view_visible(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: