Merge lp:~townsend/autopilot/fix-gcalctool-desktop-file into lp:autopilot/legacy

[Christopher Townsend]

Account for the renaming of gcalctool.desktop to gnome-calculator.desktop.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-amd64-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-legacy-utopic-i386-ci/16/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/393
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4704/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-legacy-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Lee (veebers)]

Not sure if you want a review from me but I'll comment anyway :-) This looks fine to me.

This isn't the first time something like this has happened (renamed .desktop files) I wonder (out loud) if it is worth changing this so that it is programatically populated at run time and checks the existence of a couple of known .desktop files and uses the correct one.
Although, this happens infrequently enough that I'm not sure it's worth doing that work.

review: Approve

[Christopher Townsend (townsend)]

Hey Chris,

Thanks for the review. I'll take a review from anyone who can actually get this merged:)

[Leo Arias (elopio)]

@veebers, what I'm not sure is that we need to support this. We have hardcoded ways to launch about 5 applications. That's weird. I don't understand why would we like to make it easier to launch those apps. Without the hardcoded values, it's still pretty easy to launch them.

What I would do is to depracate this functionality.

@townsend, can you please tell me why do you need this update? Are you launching the calculator in one of your tests?

[Christopher Townsend (townsend)]

@elopio

Yes, many of the Unity 7 Autopilot tests launch the calculator app and without this change, those tests fail due to Autopiplot not finding the correct .desktop file since it was renamed.

[Christopher Townsend (townsend)]

Any chance this can get approved, merged, and landed in the archive? Or some other method of choice that fixes this failure?

Thanks!

[Christopher Lee (veebers)]

In the past it has been the Unity7 team responsible for approving the legacy branch. I go ahead and top approve it now. Sorry for any confusion.

review: Approve

=== modified file 'autopilot/process/__init__.py'
--- autopilot/process/__init__.py	2014-08-05 13:46:10 +0000
+++ autopilot/process/__init__.py	2015-04-17 18:26:27 +0000
@@ -39,7 +39,7 @@
             'process-name': 'gucharmap',
         },
         'Calculator': {
-            'desktop-file': 'gcalctool.desktop',
+            'desktop-file': 'gnome-calculator.desktop',
             'process-name': 'gnome-calculator',
         },
         'Mahjongg': {