Merge lp:~elopio/gallery-app/workaround1324556-get_header into lp:gallery-app

[Leo Arias]

Added a workaround for bug 1324556.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:990
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/855/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/75
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7908
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/660
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/660/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

The proper fix has already landed on the toolkit.

Unmerged revisions

990. By Leo Arias on 2014-05-29

Added a workaround for bug 1324556.

=== modified file 'tests/autopilot/gallery_app/emulators/main_screen.py'
--- tests/autopilot/gallery_app/emulators/main_screen.py	2014-04-01 19:18:50 +0000
+++ tests/autopilot/gallery_app/emulators/main_screen.py	2014-05-29 15:44:23 +0000
@@ -5,11 +5,25 @@
 # 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
+
+import ubuntuuitoolkit
+
 from gallery_app.emulators import toolbar
 
 
-class MainScreen(toolkit_emulators.MainView):
+# XXX workaround for bug http://pad.lv/1324556
+# This is really ugly. A proper fix is in progress and should land with the
+# next toolkit release. --elopio - 2014-05-29
+
+ubuntuuitoolkit.Header.__init__ = lambda *args: fixed_init(*args)
+
+def fixed_init(instance, *args):
+    ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase.__init__(
+        instance, *args)
+    instance.main_view = instance.get_root_instance().select_single(MainScreen)
+
+
+class MainScreen(ubuntuuitoolkit.MainView):
     """An emulator class that makes it easy to interact with the gallery app"""
 
     def get_toolbar(self):