diff options
author | David Faure <david.faure@kdab.com> | 2015-07-21 13:32:09 +0200 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2015-08-12 09:03:18 +0000 |
commit | e7c17ce78801e547454ed7de947da6330e018fdf (patch) | |
tree | c3112f63dea61270429793f820e58adb1a922eea /tests/auto/corelib/mimetypes | |
parent | 34130b9caf001682f1decb6ba69b80657b814ed0 (diff) |
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>
Diffstat (limited to 'tests/auto/corelib/mimetypes')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index a4028ed70e..e9b1d7d81e 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -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(), |