Merge lp:~elopio/gallery-app/override_toolbar into lp:gallery-app

[Leo Arias]

Properly override the toolkit toolbar autopilot helper.

[lp:~elopio/gallery-app/override_toolbar]

943. By Leo Arias on 2014-04-01

Updated the copyright year.

944. By Leo Arias on 2014-04-01

Fixed typo.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:943
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/755/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/180
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4438/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4036/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3837/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4064/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6295/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5518

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/755/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:944
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/756/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/181
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4440/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4038
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3839/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4067
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6296
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5520

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/756/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'tests/autopilot/gallery_app/emulators/main_screen.py'
--- tests/autopilot/gallery_app/emulators/main_screen.py	2013-08-09 13:55:35 +0000
+++ tests/autopilot/gallery_app/emulators/main_screen.py	2014-04-01 19:19:03 +0000
@@ -1,13 +1,21 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
+# Copyright 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
-from toolbar import Toolbar
+from gallery_app.emulators import toolbar
 
 
 class MainScreen(toolkit_emulators.MainView):
     """An emulator class that makes it easy to interact with the gallery app"""
+
+    def get_toolbar(self):
+        """Return the Toolbar emulator of the MainView.
+
+        Overriden because the gallery app has custom buttons.
+
+        """
+        return self.select_single(toolbar.Toolbar)