On Thu, Mar 20, 2014 at 6:38 AM, Nicholas Skaggs <nicholas.ska...@canonical.com> wrote: >>> https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1293489 >> >> https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1294181 > > https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/standalone-ap-for-1293489/+merge/211854 > https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/revert-212/+merge/211813
Firstly, am I understanding the whole correctly here?: https://code.launchpad.net/~timo-jyrinki/ubuntu-calendar-app/bug_1293489_mega-merge/+merge/211887 It's not necessarily needed other than understanding the needed merges, but note that the last branch does not merge cleanly on top of the revert branch so those branches can't be just piled up on one another. Secondly, it seems the flaky test hasn't been flaky for the last five image test runs, for whatever the reason. The #244 image where calendar AP tests stopped being flaky on device there was mainly Qt text rendering fixes. -Timo -- Mailing list: https://launchpad.net/~ubuntu-phone Post to : ubuntu-phone@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-phone More help : https://help.launchpad.net/ListHelp