gallery-app

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

  1. override_toolbar
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Arthur Mello
Approved revision: 944
Merged at revision: 946
Proposed branch: lp:~elopio/gallery-app/override_toolbar
Merge into: lp:gallery-app
Diff against target: 27 lines (+10/-2)
1 file modified
tests/autopilot/gallery_app/emulators/main_screen.py (+10/-2)
To merge this branch: bzr merge lp:~elopio/gallery-app/override_toolbar
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+213703@code.launchpad.net

Commit message

Properly override the toolkit toolbar autopilot helper.

To post a comment you must log in.
lp:~elopio/gallery-app/override_toolbar updated
943. By Leo Arias

Updated the copyright year.

944. By Leo Arias

Fixed typo.

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

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Arthur Mello (artmello) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical2# Copyright 2013, 2014 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify it4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.6# by the Free Software Foundation.
77
8from ubuntuuitoolkit import emulators as toolkit_emulators8from ubuntuuitoolkit import emulators as toolkit_emulators
9from toolbar import Toolbar9from gallery_app.emulators import toolbar
1010
1111
12class MainScreen(toolkit_emulators.MainView):12class MainScreen(toolkit_emulators.MainView):
13 """An emulator class that makes it easy to interact with the gallery app"""13 """An emulator class that makes it easy to interact with the gallery app"""
14
15 def get_toolbar(self):
16 """Return the Toolbar emulator of the MainView.
17
18 Overriden because the gallery app has custom buttons.
19
20 """
21 return self.select_single(toolbar.Toolbar)

Subscribers

People subscribed via source and target branches

to all changes: