Unity

Merge lp:~bregma/unity/lp-1428837 into lp:unity

  1. lp-1428837
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3933
Proposed branch: lp:~bregma/unity/lp-1428837
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/unity/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1428837
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+252021@code.launchpad.net

Commit message

uses the new upstream .desktop file for D-Bus activated Nautilus instances

Description of the change

Uses the new upstream .desktop file for D-Bus activated Nautilus instances.

Redacts s couple of new AP test regressions showing up in Ubuntu "Vivid Vervet."

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

PASSED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/unity-ci/1163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/50

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

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/__init__.py'
2--- tests/autopilot/unity/tests/__init__.py 2015-02-18 14:14:48 +0000
3+++ tests/autopilot/unity/tests/__init__.py 2015-03-05 20:58:31 +0000
4@@ -249,7 +249,7 @@
5
6 def register_nautilus(self):
7 self.addCleanup(self.process_manager.unregister_known_application, "Nautilus")
8- self.process_manager.register_known_application("Nautilus", "nautilus.desktop", "nautilus")
9+ self.process_manager.register_known_application("Nautilus", "org.gnome.Nautilus.desktop", "nautilus")
10
11 def get_startup_notification_timestamp(self, bamf_window):
12 atom = display.Display().intern_atom('_NET_WM_USER_TIME')