messaging-app

Merge lp:~tiagosh/messaging-app/fix-broken-test into lp:messaging-app

  1. fix-broken-test
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 159
Merged at revision: 158
Proposed branch: lp:~tiagosh/messaging-app/fix-broken-test
Merge into: lp:messaging-app
Diff against target: 29 lines (+3/-2)
2 files modified
src/qml/Messages.qml (+1/-0)
tests/autopilot/messaging_app/emulators.py (+2/-2)
To merge this branch: bzr merge lp:~tiagosh/messaging-app/fix-broken-test
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Brendan Donegan (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+227949@code.launchpad.net

Commit message

fix broken test

Description of the change

fix broken test

To post a comment you must log in.
lp:~tiagosh/messaging-app/fix-broken-test updated
158. By Tiago Salem Herrmann

use objectName instead of icon name

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

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3612
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2195/artifact/work/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/302/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/96
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3628
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2203/artifact/work/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/303/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/97
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3650
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2221/artifact/work/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/304/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3661
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2228/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Looks good, thanks

review: Approve
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Actually if you have the chance to quickly change the docstring from:

"""Return toolbar icon with name contact"""

to

"""Return toolbar icon to add contact"""

then please do so. I won't insist on it though.

lp:~tiagosh/messaging-app/fix-broken-test updated
159. By Tiago Salem Herrmann

change comment

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

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/306/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3681
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2237/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/306/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 'src/qml/Messages.qml'
2--- src/qml/Messages.qml 2014-07-18 14:08:05 +0000
3+++ src/qml/Messages.qml 2014-07-24 13:22:26 +0000
4@@ -324,6 +324,7 @@
5 }
6 Icon {
7 id: addIcon
8+ objectName: "addNewRecipientIcon"
9 visible: multiRecipient.visible
10 height: units.gu(3)
11 width: units.gu(3)
12
13=== modified file 'tests/autopilot/messaging_app/emulators.py'
14--- tests/autopilot/messaging_app/emulators.py 2014-07-17 16:09:02 +0000
15+++ tests/autopilot/messaging_app/emulators.py 2014-07-24 13:22:26 +0000
16@@ -146,11 +146,11 @@
17 )
18
19 def get_toolbar_add_contact_icon(self):
20- """Return toolbar icon with name new-contact"""
21+ """Return toolbar icon to add contact"""
22
23 return self.select_single(
24 'Icon',
25- name='new-contact',
26+ objectName='addNewRecipientIcon',
27 )
28
29 def click_add_contact_icon(self):

Subscribers

People subscribed via source and target branches