AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qmimedatabase.cpp: Set write permission on files extracted from resources.

Browse Source 
Set QFileDevice::WriteUser on all files extracted from resources. These
are read-only, which is preserved by QFile::copy(). This caused the
deletion of the temporary directory to fail on Windows.

Change-Id: Id99de9160471c38bcec68025c89cfabbe209bdbe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Friedemann Kleint 2015-07-14 10:15:35 +02:00 committed by David Faure
parent b922e59cf7
commit 0e9b51ebac
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -72,6 +72,34 @@ static inline QString testSuiteWarning()
return result;
}
static bool copyResourceFile(const QString &sourceFileName, const QString &targetFileName,
QString *errorMessage)
{
QFile sourceFile(sourceFileName);
if (!sourceFile.exists()) {
*errorMessage = QDir::toNativeSeparators(sourceFileName) + QLatin1String(" does not exist.");
return false;
}
if (!sourceFile.copy(targetFileName)) {
*errorMessage = QLatin1String("Cannot copy ")
+ QDir::toNativeSeparators(sourceFileName) + QLatin1String(" to ")
+ QDir::toNativeSeparators(targetFileName) + QLatin1String(": ")
+ sourceFile.errorString();
return false;
}
// QFile::copy() sets the permissions of the source file which are read-only for
// resource files. Set write permission to enable deletion of the temporary directory.
QFile targetFile(targetFileName);
if (!targetFile.setPermissions(targetFile.permissions() | QFileDevice::WriteUser)) {
*errorMessage = QLatin1String("Cannot set write permission on ")
+ QDir::toNativeSeparators(targetFileName) + QLatin1String(": ")
+ targetFile.errorString();
return false;
}
return true;
}
// Set LANG before QCoreApplication is created
Q_CONSTRUCTOR_FUNCTION(initializeLang)
@ -101,15 +129,15 @@ void tst_QMimeDatabase::initTestCase()
const QString freeDesktopXml = QStringLiteral("freedesktop.org.xml");
const QString xmlFileName = QLatin1String(RESOURCE_PREFIX) + freeDesktopXml;
QVERIFY2(QFileInfo(xmlFileName).exists(), qPrintable(xmlFileName + QStringLiteral(" does not exist")));
QFile xml(xmlFileName);
QVERIFY(xml.copy(globalPackageDir + '/' + freeDesktopXml));
const QString xmlTargetFileName = globalPackageDir + QLatin1Char('/') + freeDesktopXml;
QString errorMessage;
QVERIFY2(copyResourceFile(xmlFileName, xmlTargetFileName, &errorMessage), qPrintable(errorMessage));
m_testSuite = QFINDTESTDATA("testfiles");
if (m_testSuite.isEmpty())
qWarning("%s", qPrintable(testSuiteWarning()));
const QString errorMessage = QString::fromLatin1("Cannot find '%1'");
errorMessage = QString::fromLatin1("Cannot find '%1'");
m_yastMimeTypes = QLatin1String(RESOURCE_PREFIX) + yastFileName;
QVERIFY2(QFile::exists(m_yastMimeTypes), qPrintable(errorMessage.arg(yastFileName)));
m_qmlAgainFileName = QLatin1String(RESOURCE_PREFIX) + qmlAgainFileName;
@ -830,8 +858,9 @@ void tst_QMimeDatabase::installNewGlobalMimeType()
if (!QFileInfo(destDir).isDir())
QVERIFY(QDir(m_globalXdgDir).mkpath(destDir));
QVERIFY(QFile::copy(m_yastMimeTypes, destFile));
QVERIFY(QFile::copy(m_qmlAgainFileName, destQmlFile));
QString errorMessage;
QVERIFY2(copyResourceFile(m_yastMimeTypes, destFile, &errorMessage), qPrintable(errorMessage));
QVERIFY2(copyResourceFile(m_qmlAgainFileName, destQmlFile, &errorMessage), qPrintable(errorMessage));
if (!waitAndRunUpdateMimeDatabase(mimeDir))
QSKIP("shared-mime-info not found, skipping mime.cache test");
@ -876,8 +905,9 @@ void tst_QMimeDatabase::installNewLocalMimeType()
QFile::remove(destFile);
const QString destQmlFile = destDir + QLatin1String(qmlAgainFileName);
QFile::remove(destQmlFile);
QVERIFY(QFile::copy(m_yastMimeTypes, destFile));
QVERIFY(QFile::copy(m_qmlAgainFileName, destQmlFile));
QString errorMessage;
QVERIFY2(copyResourceFile(m_yastMimeTypes, destFile, &errorMessage), qPrintable(errorMessage));
QVERIFY2(copyResourceFile(m_qmlAgainFileName, destQmlFile, &errorMessage), qPrintable(errorMessage));
if (!runUpdateMimeDatabase(mimeDir)) {
const QString skipWarning = QStringLiteral("shared-mime-info not found, skipping mime.cache test (")
+ QDir::toNativeSeparators(mimeDir) + QLatin1Char(')');