Merge lp://qastaging/~mzanetti/reminders-app/qmltest2 into lp://qastaging/reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 300
Merge reported by: Nicholas Skaggs
Merged at revision: not available
Proposed branch: lp://qastaging/~mzanetti/reminders-app/qmltest2
Merge into: lp://qastaging/reminders-app
Diff against target: 648 lines (+387/-22)
18 files modified
CMakeLists.txt (+3/-3)
debian/control (+13/-1)
src/app/CMakeLists.txt (+0/-1)
src/app/main.cpp (+1/-5)
src/app/qml/Reminders.qml (+0/-2)
src/app/qml/components/SortingDialog.qml (+3/-2)
src/app/qml/ui/EditNoteView.qml (+1/-1)
src/app/qml/ui/NotesPage.qml (+2/-0)
src/libqtevernote/notes.cpp (+18/-6)
src/libqtevernote/notesstore.cpp (+10/-0)
src/libqtevernote/notesstore.h (+2/-0)
src/plugin/CMakeLists.txt (+2/-0)
src/plugin/Evernote/CMakeLists.txt (+1/-1)
src/plugin/Evernote/evernoteplugin.cpp (+5/-0)
tests/CMakeLists.txt (+2/-0)
tests/qml/CMakeLists.txt (+48/-0)
tests/qml/tst_NotebooksDelegate.qml (+95/-0)
tests/qml/tst_NotesPage.qml (+181/-0)
To merge this branch: bzr merge lp://qastaging/~mzanetti/reminders-app/qmltest2
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Nicholas Skaggs (community) Needs Fixing
Leo Arias (community) Needs Fixing
Review via email: mp+253598@code.qastaging.launchpad.net

Commit message

Add some qmltests

Description of the change

This uses elopio's branch for qmltests and adds some more.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

There is one test failing:

FAIL! : qmltestrunner::notebooksDelegateTestCase::test_createNoteFromBottomEdge() property count

Also, there are many warnings on the test output. It would be great to fix them, or silence the ones that are expected. This branch is already big, so that can be done separately.

173 + print("closing editview")

Is it right to print to console? Shouldn't this go to a log file?

576 + //wait(500)

That commented code can be removed.

581 + wait(500)
582 + //waitForRendering(mainView)

Can we use the waitForRendering instead of the hardcoded sleep?
If not, please remove the commented statement, and add a comment on the sleep so others reading the code understand why it was added.

596 + var x = mainView.width / 2;
[...]
601 + mouseRelease(mainView, x, startY + dY)

It would be nice to wrap this into a function with a nice name.

610 + // clear the textField
611 + mouseClick(titleTextField, titleTextField.width - units.gu(1), titleTextField.height / 2);
612 + compare(titleTextField.text, "");

If this is a normal textfield from the SDK, then clearing has already been tested. I would make the test shorter by just doing titleTextField.text = "".

639 + var x = delegate.width / 2
[...]
646 + mouseClick(delegate, units.gu(3), y)

It's hard to understand what this is doing. Please make a function for it too.

669 + // TODO: Is there a better way to click on toolbar actions?

They have an object name, don't they? That's how we click them in autopilot tests.

I love the three tests in NotesPage. Thank you very much. This looks great for me. I don't fully understand some of the cpp statements, but they look simple enough.

review: Needs Fixing
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Thanks for the review, will fix the issues. It seems there's an issue with Jenkins though :/ Leo, can you help me out there? I found a bug which might be related to this: https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-snapshot/+bug/1389729

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Text conflict in CMakeLists.txt
Text conflict in src/app/qml/Reminders.qml
Text conflict in src/app/qml/ui/EditNoteView.qml
3 conflicts encountered.
bzr: ERROR: Conflicts from merge

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This needs the vivid overlay ppa added to the job in order to pass. Working on it.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Bah, this should work now, but:

Merging 'lp:reminders-app' in to 'build_dir'.
Text conflict in src/app/qml/components/NoteHeader.qml
Text conflict in src/app/qml/components/SortingDialog.qml

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> Bah, this should work now, but:
>
> Merging 'lp:reminders-app' in to 'build_dir'.
> Text conflict in src/app/qml/components/NoteHeader.qml
> Text conflict in src/app/qml/components/SortingDialog.qml

merged

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Adding the dependency and rebuilding.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Approving these :-)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/469/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/191/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/4/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/110/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/470/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/192/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/6/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/112/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/471/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/193/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/114/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/472/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/194/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/118/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Stupid old bot stopping the merge . .. grr...

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/473/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/195/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/15/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/121/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/474/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/196/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/127/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/128/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/127/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/475/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/197/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/131/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This is merged already...

DEBUG: Merging lp:~mzanetti/reminders-app/qmltest2 to lp:reminders-app
Traceback (most recent call last):
  File "/usr/bin/autoland", line 9, in <module>
    load_entry_point('jenkins-launchpad-plugin==0.1', 'console_scripts', 'autoland')()
  File "/usr/lib/python2.7/dist-packages/jlp/commands/autoland.py", line 262, in autoland
    ret = merge_and_commit(mp, args)
  File "/usr/lib/python2.7/dist-packages/jlp/commands/autoland.py", line 101, in merge_and_commit
    target.merge(source, str(mp.reviewed_revid))
  File "/usr/lib/python2.7/dist-packages/tarmac/branch.py", line 118, in merge
    branch.bzr_branch, to_revision=revid)
  File "<string>", line 4, in merge_from_branch_write_locked
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree.py", line 807, in merge_from_branch
    raise errors.PointlessMerge
bzrlib.errors.PointlessMerge: Nothing to merge.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches