Autopilot

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

  1. fix1411096-update_desktop
  2. Merge into trunk
Proposed by Christopher Lee
Status: Merged
Merged at revision: 521
Proposed branch: lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop
Merge into: lp:autopilot
Diff against target: 85 lines (+26/-7)
2 files modified
autopilot/process/__init__.py (+5/-5)
autopilot/tests/functional/test_process_emulator.py (+21/-2)
To merge this branch: bzr merge lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Richard Huddie Pending
Nicholas Skaggs Pending
Review via email: mp+246860@code.launchpad.net

This proposal supersedes a proposal from 2015-01-15.

Commit message

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

Description of the change

Updated the name of the desktop files of the known apps.
(resubmitted against trunk)

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

Looks good, I left one comment about copyright.

review: Approve
Revision history for this message
Charles Kerr (charlesk) : Posted in a previous version of this proposal
Revision history for this message
Richard Huddie (rhuddie) wrote : Posted in a previous version of this proposal

This looks good to me

review: Approve
Revision history for this message
Christopher Lee (veebers) wrote :

Looks good to me too, lets fix it in trunk though :-)

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

FAILED: Continuous integration, rev:522
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/autopilot/fix1411096-update_desktop/+merge/246860/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/958/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/21/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/434/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop updated
523. By Leo Arias

Merged with parent branch.

524. By Leo Arias

Merged with parent.

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

FAILED: Continuous integration, rev:524
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/autopilot/fix1411096-update_desktop/+merge/246860/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/25/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/29
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/439
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/439/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop updated
525. By Leo Arias

Updated the test I brought back.

Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

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

FAILED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/autopilot-ci/966/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/29/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/33
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/443/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

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

PASSED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/autopilot-ci/969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/32/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/36
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/856
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/856/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/447
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/447/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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-19 19:03:00 +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',
38
39=== modified file 'autopilot/tests/functional/test_process_emulator.py'
40--- autopilot/tests/functional/test_process_emulator.py 2014-10-22 17:23:02 +0000
41+++ autopilot/tests/functional/test_process_emulator.py 2015-01-19 19:03:00 +0000
42@@ -1,7 +1,7 @@
43 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
44 #
45 # Autopilot Functional Test Tool
46-# Copyright (C) 2012-2014 Canonical
47+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
48 #
49 # This program is free software: you can redistribute it and/or modify
50 # it under the terms of the GNU General Public License as published by
51@@ -87,7 +87,7 @@
52 # locale='C' does not work here as this goes through bamf, so we can't
53 # assert the precise name
54 self.assertThat(app.name, NotEquals(''))
55- self.assertThat(app.desktop_file, Equals('gcalctool.desktop'))
56+ self.assertThat(app.desktop_file, Equals('gnome-calculator.desktop'))
57
58 def test_start_app_window(self):
59 """Ensure we can start an Application Window."""
60@@ -119,6 +119,25 @@
61 self.assertThat(list(window.geometry), Equals(proxy_window.geometry))
62
63
64+@skipIf(model() != "Desktop", "Not suitable for device (ProcManager)")
65+class StartKnowAppsTests(AutopilotTestCase):
66+
67+ scenarios = [
68+ (app_name, {
69+ 'app_name': app_name,
70+ 'desktop_file': (
71+ ProcessManager.KNOWN_APPS[app_name]['desktop-file'])
72+ })
73+ for app_name in ProcessManager.KNOWN_APPS
74+ ]
75+
76+ def test_start_app_window(self):
77+ """Ensure we can start all the known applications."""
78+ app = self.process_manager.start_app_window(self.app_name, locale='C')
79+
80+ self.assertThat(app, NotEquals(None))
81+
82+
83 class ProcessManagerApplicationNoCleanupTests(AutopilotTestCase):
84 """Testing the process manager without the automated cleanup that running
85 within as an AutopilotTestCase provides.

Subscribers

People subscribed via source and target branches