notes-app

Merge lp:~osomon/notes-app/fix-swipe-to-delete-tests into lp:notes-app

fix-swipe-to-delete-tests
Merge into trunk

Proposed by Olivier Tilloy on 2013-10-30

Status:	Merged
Merged at revision:	219
Proposed branch:	lp:~osomon/notes-app/fix-swipe-to-delete-tests
Merge into:	lp:notes-app
Diff against target:	44 lines (+11/-7) 1 file modified tests/autopilot/notes_app/tests/test_delete.py (+11/-7)
To merge this branch:	bzr merge lp:~osomon/notes-app/fix-swipe-to-delete-tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-10-30
Ubuntu Phablet Team		2013-10-30	Pending
Review via email: mp+193177@code.launchpad.net

Commit message

Fix the slide-to-delete tests by ensuring that the confirmation button is where we expect it to be before clicking it.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/230/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/231/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/notes-app/fix-swipe-to-delete-tests updated on 2013-10-30

219. By Olivier Tilloy on 2013-10-30: Be more consistent in the swipe gestures.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/232/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/233/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-30:

There could be a regression in autopilot exposed on the otto run. I reran the job, but removed the daily-build ppa and all the tests passed:
https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/210/
https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/215/

I also tested with lp:notes-app, first with the PPA:
https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/207/

and then without:
https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/209/

But runs had failures, but the run without the PPA only had the one.

I tried a few other projects, but didn't see any noticeable differences between runs with and without the PPA. Also, some projects (notably ubuntu-ui-toolkit) are passing with the PPA.

I've made some inquires to the desktop integration team to find out what might have changed. Will try to update here if I learn anything.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-30:

Thanks Francis for the detailed investigation.
Is the daily-build PPA disabled from the CI config for notes-app now? If not, can we remove it?

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-30:

> Thanks Francis for the detailed investigation.
> Is the daily-build PPA disabled from the CI config for notes-app now? If not,
> can we remove it?

I will do that as a short term solution. In general we want to avoid this as it makes resolving build dependencies harder and forces issues to just move from upstream merger to daily release integration testing. In other words, we may be able to get your change in trunk, but it might be blocked by the same problem in daily release testing.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-30:

> > Thanks Francis for the detailed investigation.
> > Is the daily-build PPA disabled from the CI config for notes-app now? If
> not,
> > can we remove it?
>
> I will do that as a short term solution. In general we want to avoid this as
> it makes resolving build dependencies harder and forces issues to just move
> from upstream merger to daily release integration testing. In other words, we
> may be able to get your change in trunk, but it might be blocked by the same
> problem in daily release testing.

I’m fine with keeping the PPA enabled, but then we need to understand why building with it fails, and we need to fix the problem. Any idea which dependencies are breaking those tests? Or can you point me to the relevant logs so I can look into it myself?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/236/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-30:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/237/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-31:

I was wrong about this being related to autopilot. I was able to reproduce the failures on my local system, but not by upgrading autopilot, but by upgrading qtdeclarative5-ubuntu-ui-toolkit-plugin. I have not dug into this any further, but I did file a bug:

https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1246564

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-10-31:

Thanks for nailing this Francis. This is in fact a duplicate of bug #1244523, for which a MR is already pending.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Olivier Tilloy

Ubuntu Phablet Team

 === modified file 'tests/autopilot/notes_app/tests/test_delete.py'
 --- tests/autopilot/notes_app/tests/test_delete.py	2013-10-10 09:30:43 +0000
 +++ tests/autopilot/notes_app/tests/test_delete.py	2013-10-30 15:48:05 +0000
@@ -9,7 +9,7 @@
  from __future__ import absolute_import
--from testtools.matchers import Equals
++from testtools.matchers import Equals, GreaterThan, LessThan
  from autopilot.matchers import Eventually
  from notes_app.tests import NotesAppTestCase, DatabaseMixin
@@ -50,10 +50,12 @@
          # Verify that sliding the note right removes the note
          x, y, w, h = note.globalRect
--        tx = x + (w / 8)
--        ty = y + (h / 2)
--        self.pointing_device.drag(tx, ty, w, ty)
++        ty = int(y + h / 2)
++        self.pointing_device.drag(int(x + 0.1 * w), ty, int(x + 0.9 * w), ty)
          confirm = self.main_window.get_note_delete_confirmation_button(note)
++        xmax = note.globalRect[0] + note.globalRect[2] / 4
++        self.assertThat(lambda: confirm.globalRect[0],
++                        Eventually(LessThan(xmax)))
          self.pointing_device.click_object(confirm)
          self.assertThat(
@@ -64,10 +66,12 @@
          # Verify that sliding the note left removes the note
          x, y, w, h = note.globalRect
--        tx = x + (w - w / 8)
--        ty = y + (h / 2)
--        self.pointing_device.drag(tx, ty, w / 2, ty)
++        ty = int(y + h / 2)
++        self.pointing_device.drag(int(x + 0.9 * w), ty, int(x + 0.1 * w), ty)
          confirm = self.main_window.get_note_delete_confirmation_button(note)
++        xmin = note.globalRect[0] + note.globalRect[2] / 2
++        self.assertThat(lambda: confirm.globalRect[0],
++                        Eventually(GreaterThan(xmin)))
          self.pointing_device.click_object(confirm)
          self.assertThat(

notes-app

Merge lp:~osomon/notes-app/fix-swipe-to-delete-tests into lp:notes-app

Commit message

Description of the change

Preview Diff

Subscribers