Merge lp:~elopio/gallery-app/revert_workaround-1302706-click_toolbar_button_failure into lp:gallery-app

[Leo Arias]

Reverted the workaround for bug 1302706 now that it's fixed on the toolkit.
Removed the file altogether as it's no longer used.

No that the method is released to the toolkit, we no longer need to override it on the gallery.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4953
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/89
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5116/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/805/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/231
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/230
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4955
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/91
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5118/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/877/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/568
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20524

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/569
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20674

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/569
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20674

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

956. By Leo Arias on 2015-05-15

Now the toolbar object is not needed at all.

955. By Leo Arias on 2014-04-21

Reverted the workaround for bug 1302706 now that it's fixed on the toolkit.

=== removed file 'tests/autopilot/gallery_app/emulators/toolbar.py'
--- tests/autopilot/gallery_app/emulators/toolbar.py	2014-04-04 16:54:58 +0000
+++ tests/autopilot/gallery_app/emulators/toolbar.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# 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 autopilot.introspection.dbus import StateNotFoundError
-import logging
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-logger = logging.getLogger(__name__)
-
-
-class Toolbar(toolkit_emulators.Toolbar):
-    """An emulator class that makes it easy to interact with the tool bar"""
-
-    def click_button(self, object_name):
-        """Click a button of the toolbar.
-
-        The toolbar should be opened before clicking the button, or an
-        exception will be raised. If the toolbar is closed for some reason
-        (e.g., timer finishes) after moving the mouse cursor and before
-        clicking the button, it is re-opened automatically by this function.
-
-        Overriden from the toolkit because of bug http://pad.lv/1302706
-        TODO remove this method once that bug is fixed on the toolkit.
-        --elopio - 2014-04-04
-
-        :parameter object_name: The QML objectName property of the button.
-        :raise ToolkitEmulatorException: If there is no button with that object
-            name.
-
-        """
-        # ensure the toolbar is open
-        if not self.opened:
-            raise toolkit_emulators.ToolkitEmulatorException(
-                'Toolbar must be opened before calling click_button().')
-        try:
-            button = self._get_button(object_name)
-        except StateNotFoundError:
-            raise toolkit_emulators.ToolkitEmulatorException(
-                'Button with objectName "{0}" not found.'.format(object_name))
-        self.pointing_device.move_to_object(button)
-        # ensure the toolbar is still open (may have closed due to timeout)
-        self.open()
-        # click the button
-        self.pointing_device.click_object(button)
-
-    def click_custom_button(self, object_name):
-        try:
-            button = self.select_single('Button', objectName=object_name)
-            self.pointing_device.click_object(button)
-        except StateNotFoundError:
-            logger.error(
-                'Button with objectName "{0}" not found.'.format(object_name)
-            )
-            raise