Autopilot

Merge lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop into lp:~canonical-platform-qa/autopilot/tests_for_known_apps

  1. fix1411096-update_desktop
  2. Merge into tests_for_known_apps
Proposed by Leo Arias
Status: Superseded
Proposed branch: lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop
Merge into: lp:~canonical-platform-qa/autopilot/tests_for_known_apps
Diff against target: 37 lines (+5/-5)
1 file modified
autopilot/process/__init__.py (+5/-5)
To merge this branch: bzr merge lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop
Reviewer Review Type Date Requested Status
Richard Huddie (community) Approve
Nicholas Skaggs (community) Approve
Review via email: mp+246532@code.launchpad.net

This proposal has been superseded by a proposal from 2015-01-19.

Commit message

Updated the name of the desktop files of the known apps.

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Looks good, I left one comment about copyright.

review: Approve
Revision history for this message
Charles Kerr (charlesk) :
Revision history for this message
Richard Huddie (rhuddie) wrote :

This looks good to me

review: Approve
lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop updated
523. By Leo Arias

Merged with parent branch.

524. By Leo Arias

Merged with parent.

525. By Leo Arias

Updated the test I brought back.

Unmerged revisions

525. By Leo Arias

Updated the test I brought back.

524. By Leo Arias

Merged with parent.

523. By Leo Arias

Merged with parent branch.

522. By Leo Arias

Updated the name of the desktop files of the known apps.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/process/__init__.py'
2--- autopilot/process/__init__.py 2013-07-14 08:23:30 +0000
3+++ autopilot/process/__init__.py 2015-01-15 05:24:52 +0000
4@@ -1,7 +1,7 @@
5 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
6 #
7 # Autopilot Functional Test Tool
8-# Copyright (C) 2012-2013 Canonical
9+# Copyright (C) 2012, 2013, 2015 Canonical
10 #
11 # This program is free software: you can redistribute it and/or modify
12 # it under the terms of the GNU General Public License as published by
13@@ -39,11 +39,11 @@
14 'process-name': 'gucharmap',
15 },
16 'Calculator': {
17- 'desktop-file': 'gcalctool.desktop',
18+ 'desktop-file': 'gnome-calculator.desktop',
19 'process-name': 'gnome-calculator',
20 },
21 'Mahjongg': {
22- 'desktop-file': 'mahjongg.desktop',
23+ 'desktop-file': 'gnome-mahjongg.desktop',
24 'process-name': 'gnome-mahjongg',
25 },
26 'Remmina': {
27@@ -51,8 +51,8 @@
28 'process-name': 'remmina',
29 },
30 'System Settings': {
31- 'desktop-file': 'gnome-control-center.desktop',
32- 'process-name': 'gnome-control-center',
33+ 'desktop-file': 'unity-control-center.desktop',
34+ 'process-name': 'unity-control-center',
35 },
36 'Text Editor': {
37 'desktop-file': 'gedit.desktop',

Subscribers

People subscribed via source and target branches

to all changes: