Unity

Merge lp://qastaging/~azzar1/unity/lp-1169340 into lp://qastaging/unity

  1. lp-1169340
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Francis Ginther
Approved revision: no longer in the source branch.
Merged at revision: 3315
Proposed branch: lp://qastaging/~azzar1/unity/lp-1169340
Merge into: lp://qastaging/unity
Diff against target: 224 lines (+62/-9)
11 files modified
launcher/AbstractLauncherIcon.h (+1/-0)
launcher/ApplicationLauncherIcon.cpp (+5/-0)
launcher/ApplicationLauncherIcon.h (+1/-0)
launcher/LauncherIcon.h (+5/-0)
launcher/MockLauncherIcon.h (+5/-0)
launcher/SwitcherController.cpp (+2/-2)
tests/mock-application.h (+3/-1)
tests/test_application_launcher_icon.cpp (+9/-0)
tests/test_switcher_controller.cpp (+15/-0)
tests/test_switcher_controller.h (+5/-3)
tests/test_switcher_controller_class.cpp (+11/-3)
To merge this branch: bzr merge lp://qastaging/~azzar1/unity/lp-1169340
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+159485@code.qastaging.launchpad.net

Commit message

Disable detail view for webapp icons.

Description of the change

== Problem ==
Disable detail view for webapp icons.

== Test ==
Two unit tests added.

During next cycle we'll fix and re-enable the detail view for webapps.

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

FAILED: Continuous integration, rev:3302
http://jenkins.qa.ubuntu.com/job/unity-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/28
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/28/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The armhf builder died or lost connection before the build finished. I've restarted the job.

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

PASSED: Continuous integration, rev:3302
http://jenkins.qa.ubuntu.com/job/unity-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/29/rebuild

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

FAILED: Continuous integration, rev:3303
http://jenkins.qa.ubuntu.com/job/unity-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/30
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/30/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/30/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks fine, test passes.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/26
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/26/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/26

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Looks like a hardware hiccup on ps-panda-1, try again.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/27

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Jobs were running an extra test step that was unnecessary. It's been removed.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
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.