Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'fix-test' into 'master'
[qtcontacts-sqlite] Workaround issue with QWaitCondition. Contributes to MER#1853

See merge request !11
  • Loading branch information
chriadam committed Dec 14, 2017
2 parents 2773977 + 106e505 commit c6575ff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/engine/contactsengine.cpp
Expand Up @@ -611,7 +611,7 @@ class JobThread : public QThread
bool waitForFinished(QContactAbstractRequest *request, const int msecs)
{
long timeout = msecs <= 0
? LONG_MAX
? INT32_MAX
: msecs;

Job *finishedJob = 0;
Expand Down
6 changes: 6 additions & 0 deletions tests/auto/aggregation/tst_aggregation.cpp
Expand Up @@ -155,6 +155,12 @@ tst_Aggregation::~tst_Aggregation()
void tst_Aggregation::initTestCase()
{
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()
Expand Down

0 comments on commit c6575ff

Please sign in to comment.