Ubuntu Calendar App

Merge lp://qastaging/~nskaggs/ubuntu-calendar-app/fix-1335512 into lp://qastaging/ubuntu-calendar-app

  1. fix-1335512
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 344
Merged at revision: 344
Proposed branch: lp://qastaging/~nskaggs/ubuntu-calendar-app/fix-1335512
Merge into: lp://qastaging/ubuntu-calendar-app
Diff against target: 109 lines (+57/-2)
4 files modified
DayView.qml (+10/-0)
TimeLineHeaderComponent.qml (+1/-1)
tests/autopilot/calendar_app/emulators.py (+23/-0)
tests/autopilot/calendar_app/tests/test_dayview.py (+23/-1)
To merge this branch: bzr merge lp://qastaging/~nskaggs/ubuntu-calendar-app/fix-1335512
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Review via email: mp+225373@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-07-01.

Commit message

Resolved bug #1335512, add test for it, and fix display issue in timeline header (not displaying full name on current date)

Description of the change

Resolved bug #1335512, add test for it, and fix display issue in timeline header (not displaying full name on current date)

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/588/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/731
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/146

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/588/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

This fails due to https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1335241, which affects trunk. Once a fix is released to trunk, I will rebuild this.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

I'd also like to see a test added for this :-)

Revision history for this message
Mihir Soni (mihirsoni) wrote : Posted in a previous version of this proposal

This MR got merged automatically, without any reviews.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

Mihir, this is not in trunk.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

Look at the MP for 340; and check trunk yourself. It's not there:

http://bazaar.launchpad.net/~ubuntu-calendar-dev/ubuntu-calendar-app/trunk/revision/340?start_revid=340

Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me Nicholas, Thanks a lot.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:344
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/fix-1335512/+merge/225373/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/602/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/792
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/160

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/602/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:344
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/603/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/794
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/161

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/603/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/227/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/798
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/798/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/47

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:344
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/604/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/818
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/162

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/604/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: