Merge lp:~tpeeters/notes-app/remove_get_header into lp:notes-app

[Tim Peeters]

Remove the autopilot emulators get_header() function which overrides the same function from the UI toolkit.

Remove the autopilot emulators get_header() function which overrides the same function from the UI toolkit.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/notes-app-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/91
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/128
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8457
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/945
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/945/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/notes-app/remove_get_header]

268. By Tim Peeters on 2014-06-16

empty commit to push jenkins

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/notes-app-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/93
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/130
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8463
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/950
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/950/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Looks good. The error comes from autopilot:
https://bugs.launchpad.net/autopilot/+bug/1327377

Ready to be released.

review: Approve

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[lp:~tpeeters/notes-app/remove_get_header]

269. By Tim Peeters on 2014-09-09

merge trunk

Unmerged revisions

269. By Tim Peeters on 2014-09-09

merge trunk

268. By Tim Peeters on 2014-06-16

empty commit to push jenkins

267. By Tim Peeters on 2014-06-16

remove get_header() which overrides the one from uitk cpos

=== modified file 'tests/autopilot/notes_app/emulators/notesapp.py'
--- tests/autopilot/notes_app/emulators/notesapp.py	2013-11-19 19:30:40 +0000
+++ tests/autopilot/notes_app/emulators/notesapp.py	2014-09-09 20:44:42 +0000
@@ -17,9 +17,6 @@
         notes.sort(key=lambda note: note.y)
         return notes
 
-    def get_header(self):
-        return self.select_single("Header")
-
     def get_note_content(self, note_item):
         return note_item.select_single("MixedEdit")