whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: remove QSKIP in tst_QDBusMarshall::receiveUnknownType 

Omit the whole test and relative types if DBUS_TYPE_UNIX_FD is not defined
since the test is not relevant in that case (D-Bus library too old).

Change-Id: I167622f485c0f34d64984c4fa96be974e54f56bc
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
bb10
Caroline Chao 2012-10-16 12:07:21 +02:00 committed by The Qt Project
parent c5ec39b6cc
commit ceb5474d5f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
View File

@ -90,8 +90,10 @@ private slots:
void sendCallErrors_data();
void sendCallErrors();
#ifdef DBUS_TYPE_UNIX_FD
void receiveUnknownType_data();
void receiveUnknownType();
#endif
void demarshallPrimitives_data();
void demarshallPrimitives();
@ -1028,6 +1030,8 @@ void tst_QDBusMarshall::sendCallErrors()
QCOMPARE(reply.errorMessage(), errorMsg);
}
#ifdef DBUS_TYPE_UNIX_FD
// If DBUS_TYPE_UNIX_FD is not defined, it means the current system's D-Bus library is too old for this test
void tst_QDBusMarshall::receiveUnknownType_data()
{
QTest::addColumn<int>("receivedTypeId");
@ -1078,9 +1082,6 @@ public:
void tst_QDBusMarshall::receiveUnknownType()
{
#ifndef DBUS_TYPE_UNIX_FD
QSKIP("Your system's D-Bus library is too old for this test");
#else
QDBusConnection con = QDBusConnection::sessionBus();
QVERIFY(con.isConnected());
@ -1184,8 +1185,8 @@ void tst_QDBusMarshall::receiveUnknownType()
//qDebug() << spy.list.at(0).arguments().at(0).typeName();
QCOMPARE(spy.list.at(0).arguments().at(0).userType(), receivedTypeId);
}
#endif
}
#endif
void tst_QDBusMarshall::demarshallPrimitives_data()
{