Mercurial > trustbridge
diff ui/tests/nsstest.cpp @ 330:1e6d1eab8395
Fix NSS unit test for Windows and change how instructions are written
This was supposed to fix the block on error. But it did not.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 08 Apr 2014 15:08:57 +0000 |
| parents | ad28f6b60e6b |
| children | a54925d41056 |
line wrap: on
line diff
--- a/ui/tests/nsstest.cpp Tue Apr 08 14:52:31 2014 +0000 +++ b/ui/tests/nsstest.cpp Tue Apr 08 15:08:57 2014 +0000 @@ -10,6 +10,11 @@ #include "strhelp.h" #include <QTest> +#include <QTextCodec> + +#ifdef WIN32 +#define endl "\r\n" +#endif QList<QByteArray> NSSTest::get_nss_certs (QTemporaryDir *nssDir) { @@ -40,9 +45,9 @@ void NSSTest::setupTestDir(QTemporaryDir *nssDir) { /* Copy the empty nss db in the temporary dir */ - QFile::copy(":/nss/cert8.db", nssDir->path() + "/" +"cert8.db"); - QFile::copy(":/nss/key3.db", nssDir->path() + "/" +"key3.db"); - QFile::copy(":/nss/secmod.db", nssDir->path() + "/" +"secmod.db"); + QVERIFY(QFile::copy(":/nss/cert8.db", nssDir->path() + "/" +"cert8.db")); + QVERIFY(QFile::copy(":/nss/key3.db", nssDir->path() + "/" +"key3.db")); + QVERIFY(QFile::copy(":/nss/secmod.db", nssDir->path() + "/" +"secmod.db")); QVERIFY(QFile::setPermissions(nssDir->path() + "/" +"cert8.db", QFileDevice::ReadOwner | QFileDevice::WriteOwner)); @@ -50,9 +55,11 @@ QFileDevice::ReadOwner | QFileDevice::WriteOwner)); QVERIFY(QFile::setPermissions(nssDir->path() + "/" +"secmod.db", QFileDevice::ReadOwner | QFileDevice::WriteOwner)); + nssDir->setAutoRemove(false); } void NSSTest::initTestCase() { + QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); /* use system default */ /* Set up a temporary list */ QFile res(":/list-valid-signed.txt"); @@ -67,6 +74,7 @@ validList = CertificateList(validListFile.fileName().toLocal8Bit().data()); /* Create the profiles.ini `s set environment variables*/ + fakeHome.setAutoRemove(false); #ifndef WIN32 QVERIFY(!setenv ("HOME", fakeHome.path().toLocal8Bit().constData(), 1)); fakeFirefoxDir = QDir(fakeHome.path() + "/.mozilla/firefox");