From kde-pim  Mon Jul 30 23:50:54 2007
From: Kevin Krammer <kevin.krammer () gmx ! at>
Date: Mon, 30 Jul 2007 23:50:54 +0000
To: kde-pim
Subject: [Kde-pim] [patch] akonadi/server/tests/unittest re-enabling
Message-Id: <200707310151.03754.kevin.krammer () gmx ! at>
X-MARC-Message: https://marc.info/?l=kde-pim&m=118583950222199
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--===============0170291351=="

--===============0170291351==
Content-Type: multipart/signed;
  boundary="nextPart2184667.KCyADu1qsq";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit

--nextPart2184667.KCyADu1qsq
Content-Type: multipart/mixed;
  boundary="Boundary-01=_elnrGWjxQJ/CALE"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_elnrGWjxQJ/CALE
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi again,

patch for re-enabling handlertest but make it QSKIP in case the configured=
=20
database driver is MYSQL/Embedded (since according to a previous commit log=
=20
this will make it fail)

=46ixed typo in CMakeLists.txt (missing 't' at end of handlertest)

Cheers,
Kevin

=2D-=20
Kevin Krammer, KDE developer, xdg-utils developer
KDE user support, developer mentoring

--Boundary-01=_elnrGWjxQJ/CALE
Content-Type: text/x-diff;
  charset="us-ascii";
  name="handlertest.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="handlertest.diff"

Index: CMakeLists.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- CMakeLists.txt	(Revision 694519)
+++ CMakeLists.txt	(Arbeitskopie)
@@ -2,9 +2,6 @@
=20
 set(handlertest_SRCS handlertest.cpp teststoragebackend.cpp )
=20
+kde4_add_unit_test(handlertest TESTNAME akonadi-handlertest ${handlertest_=
SRCS})
=20
=2D# FIXME: handlertest hangs because you can't open the mysql database twi=
ce
=2D#kde4_add_unit_test(handlertes TESTNAME akonadi-handlertest ${handlertes=
t_SRCS})
=2D
=2D#target_link_libraries(handlertest akonadiprivate ${QT_QTTEST_LIBRARY})
=2D
+target_link_libraries(handlertest akonadiprivate ${QT_QTTEST_LIBRARY})
Index: handlertest.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- handlertest.cpp	(Revision 694519)
+++ handlertest.cpp	(Arbeitskopie)
@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.        =
 *
  *************************************************************************=
**/
=20
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
 #include <QtCore/QMetaType>
 #include <QtCore/QVariant>
=20
@@ -29,11 +31,17 @@
=20
 void HandlerTest::initTestCase()
 {
+    // According to Volker (see log of Revision 623747), the handler test
+    // does not work with MYSQL/Embedded
+    QSettings settings( QDir::homePath() + QLatin1String("/.akonadi/akonad=
iserverrc"), QSettings::IniFormat );
+    if ( settings.value( QLatin1String("General/Driver"), QLatin1String( "=
QMYSQL" ) ).toString() =3D=3D QLatin1String( "QMYSQL_EMBEDDED" ) )
+        QSKIP( "HandlerTest does not work with MYSQL/Embedded", SkipAll );
+
     qRegisterMetaType<Response>("Response");
 }
=20
 void HandlerTest::testInit()
=2D{=20
+{
 }
=20
 /// ---- List ----

--Boundary-01=_elnrGWjxQJ/CALE--

--nextPart2184667.KCyADu1qsq
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBGrnlnnKMhG6pzZJIRAtigAJ4+b1xtCR1EiKpY2H4F6yJkmc54RQCeI6CN
d/1mE7FTtTlslTeCoJ/2BBg=
=vcHj
-----END PGP SIGNATURE-----

--nextPart2184667.KCyADu1qsq--

--===============0170291351==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
--===============0170291351==--