[Kde-pim] Review Request 111765: Port Akonadi test runner to use multi-instance mode.
Volker Krause
vkrause at kde.org
Wed Jul 31 08:37:17 BST 2013
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111765/
-----------------------------------------------------------
(Updated July 31, 2013, 7:37 a.m.)
Status
------
This change has been marked as submitted.
Review request for KDEPIM-Libraries.
Description
-------
So far the test runner created a completely isolated environment, starting its own D-Bus daemon and KDE processes. Instead we now use the multi-instance feature of Akonadi to re-use most of the host session. This trades perfect isolation for speed and convenience.
Git Log:
Namespace agent config files correctly.
Properly namespace stuff in XDG_[CONFIG|DATA]_DIR.
Simplify copyDirectory() a bit.
Also create all missing parent directories.
This will be needed for the more complex folder layout of the
multi-instance setup.
Disable agent auto-starting by default.
Much safer, and can always be enabled explicitly in the environment
config file if really needed for some tests.
Remove dead code.
Restore D-Bus interaction between the runner and the generated shell script.
Remove the environment variable cleaning.
No longer needed since we are using the host session for most things now.
Also it didn't actually seem to work, it did still happily see the
Akonadi instance identifier, the D-Bus session, LD_LIBRARY_PATH etc.
Remove obsolete kabc/kcal dependencies.
Port server restarting to proper Akonadi API.
Port the shutdown code to Akonadi::ServerManager.
Port synchronization step to proper Akonadi jobs.
Port agent instance creation to proper Akonadi API instead of raw D-Bus.
Don't mess with KLauncher and sycoca, also coming from the host session now.
Remove the manual D-Bus daemon startup/shutdown code.
No longer needed, we are going to use the host session now.
Port server state detection to use Akonadi::ServerManager.
Start the Akonadi server with the correct instance identifier.
Add Akonadi session instance identifier setup.
Mac OS 10.4 is no longer a concern.
Diffs
-----
akonadi/tests/testrunner/CMakeLists.txt ae0d4686f9fcd04753597265098bed168420ff81
akonadi/tests/testrunner/main.cpp 6d7d0cc97345bf7e61a22ac9ee808c2539e08fdf
akonadi/tests/testrunner/setup.h 6013dc19f9fb7a36433e885cf63cda805ceffd0b
akonadi/tests/testrunner/setup.cpp 2850e6ac40143b23e9474b22bc4e5fbcc72d2f7a
akonadi/tests/testrunner/shellscript.cpp 21132a924db87bc35c78e92e45df83c493c7f8e3
akonadi/tests/testrunner/testrunner-config.xsd 39c28e787561376c789aaf4e1a687b1a2ddb4551
Diff: http://git.reviewboard.kde.org/r/111765/diff/
Testing
-------
Test environment comes up and agents are set up correctly. Knut test resource payloads are missing, but they are missing in the normal session too (ie. unrelated regression).
Thanks,
Volker Krause
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
More information about the kde-pim
mailing list