webbrowser-app

Merge lp:~bzoltan/webbrowser-app/UCAbstractButton into lp:webbrowser-app

  1. UCAbstractButton
  2. Merge into trunk
Proposed by Zoltan Balogh on 2015-09-08
Status: Merged
Approved by: Zoltan Balogh on 2015-09-08
Approved revision: 1175
Merged at revision: 1173
Proposed branch: lp:~bzoltan/webbrowser-app/UCAbstractButton
Merge into: lp:webbrowser-app
Diff against target: 29 lines (+3/-4)
1 file modified
tests/autopilot/webbrowser_app/emulators/browser.py (+3/-4)
To merge this branch: bzr merge lp:~bzoltan/webbrowser-app/UCAbstractButton
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-09-08
Olivier Tilloy Approve on 2015-09-08
Christian Dywan 2015-09-08 Needs Fixing on 2015-09-08
Review via email: mp+270369@code.launchpad.net

Commit Message

Use right name for AbstractButton when 1.3 UITK is used.

Description of the Change

Use right name for AbstractButton when 1.3 UITK is used.

To post a comment you must log in.
Olivier Tilloy (osomon) wrote :

The browser app (and webapp container) already depend on the UITK >= 1.3, so I don’t think there is a need for a try…except clause, just updating the expected name to 'UCAbstractButton' should be enough, no?

Christian Dywan (kalikiana) wrote :

This can be much simpler. Use the objectName only and there's no need for try regardless of the UITK version used.

review: Needs Fixing
Zoltan Balogh (bzoltan) wrote :

Sadly no. I tried that and it made the Unity8 crash.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~bzoltan/webbrowser-app/UCAbstractButton updated on 2015-09-08
1173. By Zoltan Balogh on 2015-09-08

Use objectname only not the type

1174. By Zoltan Balogh on 2015-09-08

make flake8 happy

Olivier Tilloy (osomon) wrote :

That looks better (although I really wonder why specifying "UCAbstractButton" would make unity8 crash, and that should be investigated and understood before proceeding).

Please revert the removal of the blank line after the imports.

review: Needs Fixing
lp:~bzoltan/webbrowser-app/UCAbstractButton updated on 2015-09-08
1175. By Zoltan Balogh on 2015-09-08

revert of the empty line removaö

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1174
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4058/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/947
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/947
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3314/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4055
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4055/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23127

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

review: Needs Fixing (continuous-integration)
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1175
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/950
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4059
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4059/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23134

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2196/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 2015-09-03 09:46:29 +0000
3+++ tests/autopilot/webbrowser_app/emulators/browser.py 2015-09-08 10:15:23 +0000
4@@ -263,8 +263,7 @@
5
6 def get_drawer_action(self, actionName):
7 drawer = self.get_drawer()
8- return drawer.select_single("AbstractButton", objectName=actionName,
9- visible=True)
10+ return drawer.select_single(objectName=actionName, visible=True)
11
12 def get_tabs_bar(self):
13 return self.select_single(TabsBar)
14@@ -386,7 +385,7 @@
15
16 @autopilot.logging.log_action(logger.info)
17 def close(self):
18- button = self.select_single("AbstractButton", objectName="closeButton")
19+ button = self.select_single(objectName="closeButton")
20 self.pointing_device.click_object(button)
21
22
23@@ -449,7 +448,7 @@
24
25 @autopilot.logging.log_action(logger.info)
26 def click_back_button(self):
27- button = self.select_single("AbstractButton", objectName="backButton")
28+ button = self.select_single(objectName="backButton")
29 self.pointing_device.click_object(button)
30
31

Subscribers

People subscribed via source and target branches

to status/vote changes: