Unity

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

  1. lp-1402707
  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: 3898
Proposed branch: lp:~bregma/unity/lp-1402707
Merge into: lp:unity
Diff against target: 11 lines (+1/-1)
1 file modified
tests/autopilot/unity/tests/launcher/test_scroll.py (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1402707
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Review via email: mp+244752@code.launchpad.net

Commit message

fix AP test failures due to upstream FileRoller .desktop file rename

Description of the change

Some AP tests were failing because they relied on the hard-coded .desktop file names of applications and those filenames have been changed by upstream.

This MP fixes those tests so they no longer fail to start the applications.

See also bug #1402024 for similar problems in the Autopilot framework itself.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

+1

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/launcher/test_scroll.py'
2--- tests/autopilot/unity/tests/launcher/test_scroll.py 2014-01-21 19:02:50 +0000
3+++ tests/autopilot/unity/tests/launcher/test_scroll.py 2014-12-15 15:28:22 +0000
4@@ -27,7 +27,7 @@
5 if "System Monitor" not in self.process_manager.KNOWN_APPS:
6 self.process_manager.register_known_application("System Monitor", "gnome-system-monitor.desktop", "gnome-system-monitor")
7 if "Archive Manager" not in self.process_manager.KNOWN_APPS:
8- self.process_manager.register_known_application("Archive Manager", "file-roller.desktop", "file-roller")
9+ self.process_manager.register_known_application("Archive Manager", "org.gnome.FileRoller.desktop", "file-roller")
10
11 apps = ("Calculator", "Mahjongg", "Text Editor", "Character Map", "Terminal", "Remmina", "System Monitor", "Archive Manager")
12