Merge lp://qastaging/~mzanetti/reminders-app/qmltest2 into lp://qastaging/reminders-app
- qmltest2
- Merge into trunk
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 | ||||||||
Related bugs: |
|
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:
|
Commit message
Add some qmltests
Description of the change
This uses elopio's branch for qmltests and adds some more.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:297
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:298
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:297
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:297
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Leo Arias (elopio) wrote : | # |
There is one test failing:
FAIL! : qmltestrunner:
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 + //waitForRender
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(
It would be nice to wrap this into a function with a nice name.
610 + // clear the textField
611 + mouseClick(
612 + compare(
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(
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.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:297
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
CI have a card for this which they're tracking.
https:/
No solution proposed though.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:297
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
Text conflict in CMakeLists.txt
Text conflict in src/app/
Text conflict in src/app/
3 conflicts encountered.
bzr: ERROR: Conflicts from merge
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:298
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
This needs the vivid overlay ppa added to the job in order to pass. Working on it.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:298
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:298
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
Bah, this should work now, but:
Merging 'lp:reminders-app' in to 'build_dir'.
Text conflict in src/app/
Text conflict in src/app/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Michael Zanetti (mzanetti) wrote : | # |
> Bah, this should work now, but:
>
> Merging 'lp:reminders-app' in to 'build_dir'.
> Text conflict in src/app/
> Text conflict in src/app/
merged
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:299
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:300
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
Adding the dependency and rebuilding.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:298
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:300
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
Approving these :-)
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:300
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Nicholas Skaggs (nskaggs) wrote : | # |
Stupid old bot stopping the merge . .. grr...
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
FAILURE: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
FAILURE: https:/
FAILURE: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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:/
Executed test runs:
None: https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:300
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
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/
load_
File "/usr/lib/
ret = merge_and_
File "/usr/lib/
target.
File "/usr/lib/
branch.
File "<string>", line 4, in merge_from_
File "/usr/lib/
raise errors.
bzrlib.
FAILED: Continuous integration, rev:296 91.189. 93.70:8080/ job/reminders- app-ci/ 723/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 2381/console 91.189. 93.70:8080/ job/reminders- app-utopic- amd64-ci/ 325/console 91.189. 93.70:8080/ job/reminders- app-vivid- amd64-ci/ 144/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/reminders- app-ci/ 723/rebuild
http://