Commit c6575ffe authored by chriadam's avatar chriadam

Merge branch 'fix-test' into 'master'

[qtcontacts-sqlite] Workaround issue with QWaitCondition. Contributes to MER#1853

See merge request !11
parents 2773977b 106e505d
...@@ -611,7 +611,7 @@ public: ...@@ -611,7 +611,7 @@ public:
bool waitForFinished(QContactAbstractRequest *request, const int msecs) bool waitForFinished(QContactAbstractRequest *request, const int msecs)
{ {
long timeout = msecs <= 0 long timeout = msecs <= 0
? LONG_MAX ? INT32_MAX
: msecs; : msecs;
Job *finishedJob = 0; Job *finishedJob = 0;
......
...@@ -155,6 +155,12 @@ tst_Aggregation::~tst_Aggregation() ...@@ -155,6 +155,12 @@ tst_Aggregation::~tst_Aggregation()
void tst_Aggregation::initTestCase() void tst_Aggregation::initTestCase()
{ {
registerIdType(); registerIdType();
/* Make sure the DB is empty */
QContactDetailFilter allSyncTargets;
setFilterDetail<QContactSyncTarget>(allSyncTargets, QContactSyncTarget::FieldSyncTarget);
m_cm->removeContacts(m_cm->contactIds(allSyncTargets));
waitForSignalPropagation();
} }
void tst_Aggregation::init() void tst_Aggregation::init()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment