GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Increase timeout when waiting for signals.

Browse Source 
* lang/qt/tests/t-support.h (QSIGNALSPY_TIMEOUT): New macro.
* lang/qt/tests/t-encrypt.cpp: Use the new macro as timeout when
waiting for signals.
* lang/qt/tests/t-keylist.cpp: Likewise.
* lang/qt/tests/t-keylocate.cpp: Likewise.
* lang/qt/tests/t-ownertrust.cpp: Likewise.
* lang/qt/tests/t-wkspublish.cpp: Likewise.
--
Increase the timeout when waiting for signals from 5 seconds to 60.
This addresses intermittent test failures on slow machines.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-01-31 10:47:00 +01:00
parent 752d3597ef
commit ba594d85e3
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/qt/tests/t-encrypt.cpp
View File

@ -165,7 +165,7 @@ private Q_SLOTS:
job->start(keys, inptr, outptr, Context::AlwaysTrust);
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
void testSymmetricEncryptDecrypt()

2
lang/qt/tests/t-keylist.cpp
View File

@ -102,7 +102,7 @@ private Q_SLOTS:
});
job->start(QStringList() << "alfa@example.net");
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
};

4
lang/qt/tests/t-keylocate.cpp
View File

@ -88,7 +88,7 @@ private Q_SLOTS:
});
job->start(QStringList() << mTestpattern);
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
qputenv("GNUPGHOME", oldHome.toUtf8());
}
#endif
@ -122,7 +122,7 @@ private Q_SLOTS:
});
job->start(QStringList() << mTestpattern);
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
private:

4
lang/qt/tests/t-ownertrust.cpp
View File

@ -78,7 +78,7 @@ private Q_SLOTS:
});
job2->start(key, Key::Ultimate);
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
job = openpgp()->keyListJob(false, true, true);
result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),
@ -94,7 +94,7 @@ private Q_SLOTS:
Q_EMIT asyncDone();
});
job3->start(key, Key::Unknown);
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
job = openpgp()->keyListJob(false, true, true);
result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),

4
lang/qt/tests/t-support.h
View File

@ -64,4 +64,8 @@ public Q_SLOTS:
void cleanupTestCase();
};
/* Timeout, in milliseconds, for use with QSignalSpy to wait on
signals. */
#define QSIGNALSPY_TIMEOUT 60000
#endif // T_SUPPORT_H

14
lang/qt/tests/t-wkspublish.cpp
View File

@ -132,7 +132,7 @@ private Q_SLOTS:
});
job->startCheck ("testuser1@localhost");
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
#ifdef DO_ONLINE_TESTS
private Q_SLOTS:
@ -155,7 +155,7 @@ private:
});
job->startCheck ("testuser1@test.gnupg.org");
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
void testWKSPublishErrors() {
@ -172,7 +172,7 @@ private:
job->startCreate("AB874F24E98EBB8487EE7B170F8E3D97FE7011B7",
QStringLiteral("Foo@bar.baz"));
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
void testWKSPublishCreate() {
@ -206,7 +206,7 @@ private:
});
keygenjob->start(args);
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
/* Then try to create a request. */
auto job = openpgp()->wksPublishJob();
@ -223,7 +223,7 @@ private:
QStringLiteral("From: " TEST_ADDRESS)));
});
job->startCreate(fpr.constData(), QLatin1String(TEST_ADDRESS));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
void testWKSPublishReceive() {
@ -242,7 +242,7 @@ private:
});
importjob->start(QByteArray(testSecKey));
QSignalSpy spy (this, SIGNAL(asyncDone()));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
/* Get a response. */
auto job = openpgp()->wksPublishJob();
@ -259,7 +259,7 @@ private:
QStringLiteral("From: " TEST_ADDRESS)));
});
job->startReceive(QByteArray(testResponse));
QVERIFY(spy.wait());
QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
}
void initTestCase()