Merge lp:~fboucault/webbrowser-app/history_domain_no_extra_sorting into lp:webbrowser-app/staging
Status: | Approved |
---|---|
Approved by: | Andrew Hayzen |
Approved revision: | 1629 |
Proposed branch: | lp:~fboucault/webbrowser-app/history_domain_no_extra_sorting |
Merge into: | lp:webbrowser-app/staging |
Diff against target: |
165 lines (+38/-16) 4 files modified
src/app/webbrowser/HistoryView.qml (+2/-6) src/app/webbrowser/history-domainlist-model.cpp (+27/-4) src/app/webbrowser/history-domainlist-model.h (+3/-0) tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp (+6/-6) |
To merge this branch: | bzr merge lp:~fboucault/webbrowser-app/history_domain_no_extra_sorting |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Hayzen (community) | Approve | ||
Review via email:
|
Commit message
HistoryDomainLi
Description of the change
HistoryDomainLi
Unmerged revisions
- 1629. By Florian Boucault
-
Added HistoryDomainLi
stModel: :get: fixes unit tests HistoryView: :test_delete_ multiple_ domains and HistoryView: :test_select_ all - 1628. By Florian Boucault
-
Merged from staging
- 1627. By Florian Boucault
-
HistoryDomainLi
stModel: preserve order of insertion which is de facto by 'lastVisit'. That makes it possible to not use an extra SortFilterModel in HistoryView which was slowing down loading dramatically when enough history is gathered.
I'm getting the following two failures with this branch that I wasn't getting in staging.
2: QWARN : QmlTests: :HistoryView: :test_delete_ multiple_ domains( ) file:// /tmp/webbrowser /history_ domain_ no_extra_ sorting/ src/app/ webbrowser/ HistoryView. qml:179: TypeError: Property 'get' of object HistoryDomainLi stModel( 0x146be40) is not a function :HistoryView: :test_delete_ multiple_ domains( ) property selectMode r/history_ domain_ no_extra_ sorting/ tests/unittests /qml/tst_ HistoryView. qml(153) ]
2: FAIL! : QmlTests:
2: Actual (): true
2: Expected (): false
2: Loc: [/tmp/webbrowse
2: QWARN : QmlTests: :HistoryView: :test_select_ all() file:// /tmp/webbrowser /history_ domain_ no_extra_ sorting/ src/app/ webbrowser/ HistoryView. qml:179: TypeError: Property 'get' of object HistoryDomainLi stModel( 0x1c73c70) is not a function :HistoryView: :test_select_ all() property count r/history_ domain_ no_extra_ sorting/ tests/unittests /qml/tst_ HistoryView. qml(190) ]
2: FAIL! : QmlTests:
2: Actual (): 3
2: Expected (): 0
2: Loc: [/tmp/webbrowse
Also note in both this branch and staging flake8 fails for me with the following, looks like a regression has slipped into staging. (this issue can be fixed in another branch or in this one)
1: /tmp/webbrowser /staging/ tests/autopilot /webbrowser_ app/tests/ test_fullscreen .py:102: 1: E302 expected 2 blank lines, found 1 /staging/ tests/autopilot /webbrowser_ app/tests/ test_fullscreen .py:106: 80: E501 line too long (82 > 79 characters)
1: /tmp/webbrowser