tst_qmimedatabase: check that QFile::remove() worked.

It failed on Windows due to readonly files copied from the resource,
until adding a setPermission call.

Change-Id: I1d42b53763583aca73d011e0f2bbf061ef6aa891
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
bb10
David Faure 2015-07-21 13:32:09 +02:00
parent 34130b9caf
commit e7c17ce788
1 changed files with 4 additions and 4 deletions

View File

@ -904,8 +904,8 @@ void tst_QMimeDatabase::installNewGlobalMimeType()
QString::fromLatin1("text/x-qml"));
// Now test removing it again
QFile::remove(destFile);
QFile::remove(destQmlFile);
QVERIFY(QFile::remove(destFile));
QVERIFY(QFile::remove(destQmlFile));
if (m_isUsingCacheProvider && !waitAndRunUpdateMimeDatabase(mimeDir))
QSKIP("shared-mime-info not found, skipping mime.cache test");
QCOMPARE(db.mimeTypeForFile(QLatin1String("foo.ymu"), QMimeDatabase::MatchExtension).name(),
@ -953,8 +953,8 @@ void tst_QMimeDatabase::installNewLocalMimeType()
QString::fromLatin1("text/x-qml"));
// Now test removing the local mimetypes again (note, this leaves a mostly-empty mime.cache file)
QFile::remove(destFile);
QFile::remove(destQmlFile);
QVERIFY(QFile::remove(destFile));
QVERIFY(QFile::remove(destQmlFile));
if (m_isUsingCacheProvider && !waitAndRunUpdateMimeDatabase(m_localMimeDir))
QSKIP("shared-mime-info not found, skipping mime.cache test");
QCOMPARE(db.mimeTypeForFile(QLatin1String("foo.ymu"), QMimeDatabase::MatchExtension).name(),