Merge lp://qastaging/~unity-team/unity/enable-vala-tests into lp://qastaging/unity

Proposed by Neil J. Patel
Status: Rejected
Rejected by: Mikkel Kamstrup Erlandsen
Proposed branch: lp://qastaging/~unity-team/unity/enable-vala-tests
Merge into: lp://qastaging/unity
Diff against target: 2726 lines (+533/-2012)
24 files modified
src/unityshell.cpp (+1/-1)
tests/CMakeLists.txt (+37/-8)
tests/vala/numpty.cpp (+1/-0)
tests/vala/test-appinfo-manager.vala (+146/-0)
tests/vala/test-io.vala (+86/-0)
tests/vala/test-place-browser.vala (+129/-0)
tests/vala/test-unit.vala (+7/-31)
tests/vala/test-utils.vala (+126/-0)
vala_tests/ui/Makefile.am (+0/-73)
vala_tests/ui/data/Makefile.am (+0/-1)
vala_tests/ui/test-automate.vala (+0/-131)
vala_tests/ui/test-const.vapi (+0/-25)
vala_tests/ui/test-home-button.vala (+0/-188)
vala_tests/ui/test-indicators.vala (+0/-321)
vala_tests/ui/test-quicklist.vala (+0/-85)
vala_tests/ui/test-ui.vala (+0/-129)
vala_tests/unit/Makefile.am (+0/-85)
vala_tests/unit/test-dbusmenu-quicklists.vala (+0/-188)
vala_tests/unit/test-launcher.vala (+0/-223)
vala_tests/unit/test-panel-indicator-object-entry-view.vala (+0/-97)
vala_tests/unit/test-panel-indicator-object-view.vala (+0/-154)
vala_tests/unit/test-places-place-file-model.vala (+0/-43)
vala_tests/unit/test-places-place.vala (+0/-161)
vala_tests/unit/test-places.vala (+0/-68)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity/enable-vala-tests
Reviewer Review Type Date Requested Status
Gord Allott Pending
Review via email: mp+42094@code.qastaging.launchpad.net

Description of the change

- Removes all the tests that no longer apply
- Re-enables building of vala tests for libunity
- Adds test-vala to the make check target
- Stubs for test-appinfo-manager.vala and test-io.vala, both of which won't compile on my system so I couldn't add them.
- I left test-pixbuf-cache because I'm still thinking what to do with it

you should be able to `make check` and see all the tests fly by and (hopefully) pass.

N.B. unity.[h|cpp] => unityshell.[h|cpp] because it clashes with the unity.h that libunity produces and, in any case, this now matches the plugin name.

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

some small comments;
build won't work properly with -j<number>, requires you to make twice, because on the first build unity.vapi isn't built when something needs it (other jobs are still building libunity)
[ 1%] make[2]: *** No rule to make target `libunity/unity.vapi', needed by `tests/vala/test-unit.c'. Stop.

not all tests pass

  /Unit/Place/TwoEntries: **
ERROR:/home/gord/canonical/unity/enable-vala-tests/build/tests/vala/test-place.c:228:unity_tests_unit_place_suite_test_two_entries: assertion failed: (_vala_strcmp0 (entry_paths[0], entry_path1) == 0)
FAIL

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

I merged this branch into lp:~kamstrup/unity/gio-vapi-break-fixes. So we can close this merge proposal.

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.