Fix tests relating to the removal of the Root Place in D15739
ClosedPublic

Authored by meven on Jun 13 2019, 9:27 PM.

Diff Detail

Repository
R318 Dolphin
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
meven created this revision.Jun 13 2019, 9:27 PM
Restricted Application added a project: Dolphin. · View Herald TranscriptJun 13 2019, 9:27 PM
Restricted Application added a subscriber: kfm-devel. · View Herald Transcript
meven requested review of this revision.Jun 13 2019, 9:27 PM
meven edited the summary of this revision. (Show Details)Jun 13 2019, 9:28 PM
meven added reviewers: elvisangelaccio, ngraham.
ngraham accepted this revision.Jun 13 2019, 9:38 PM
This revision is now accepted and ready to land.Jun 13 2019, 9:38 PM

I may need to add some sort of "#if KIO_VERSION < QT_VERSION_CHECK(5,60,0)" all over the place.
I have tried it but I haven't found similar patterns to base upon.
If I don't, it will make dolphin tests depends on kio master/5.60, unless this is tolerable.
I don't know the expectancies on tests.
Your call @elvisangelaccio.

I may need to add some sort of "#if KIO_VERSION < QT_VERSION_CHECK(5,60,0)" all over the place.
I have tried it but I haven't found similar patterns to base upon.
If I don't, it will make dolphin tests depends on kio master/5.60, unless this is tolerable.
I don't know the expectancies on tests.
Your call @elvisangelaccio.

Probably makes sense to bump the Frameworks dependency version instead (safe since we're still in master development), but yeah, it's @elvisangelaccio's call.

elvisangelaccio requested changes to this revision.Jun 16 2019, 8:32 PM

I'd avoid to bump the KF5 version only because of a test.

What we can do instead is to add the following check in src/tests/CMakeLists.txt :

if (KIO_VERSION VERSION_GREATER_EQUAL "5.60.0")
    ecm_add_test(placesitemmodeltest.cpp ...)
endif()
This revision now requires changes to proceed.Jun 16 2019, 8:32 PM
meven updated this revision to Diff 60017.Jun 18 2019, 11:09 AM

Run placesitemmodeltest only when KIO_VERSION >= 5.60

I'd avoid to bump the KF5 version only because of a test.

What we can do instead is to add the following check in src/tests/CMakeLists.txt :

if (KIO_VERSION VERSION_GREATER_EQUAL "5.60.0")
    ecm_add_test(placesitemmodeltest.cpp ...)
endif()

This is done, will wait for approval here before merging in KIO D15739.

elvisangelaccio accepted this revision.Jun 23 2019, 2:05 PM
This revision is now accepted and ready to land.Jun 23 2019, 2:05 PM
This revision was automatically updated to reflect the committed changes.