1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QFile::largeUncFileSupport(): Use QTRY_VERIFY() to open the file

Browse Source 
Open failures due to sharing violations have been observed in Coin.

Change-Id: If7fbe01a454b3c343c0b87f73db50c28eae901c3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Friedemann Kleint 2017-10-25 13:57:26 +02:00
parent cd45d0f712
commit 1c3dc8cfb8
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -1615,6 +1615,27 @@ void tst_QFile::writeTextFile()
} }
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
// Helper for executing QFile::open() with warning in QTRY_VERIFY(), which evaluates the condition
// multiple times
static bool qFileOpen(QFile &file, QIODevice::OpenMode ioFlags)
{
const bool result = file.isOpen() || file.open(ioFlags);
if (!result)
qWarning() << "Cannot open" << file.fileName() << ':' << file.errorString();
return result;
}
// Helper for executing fopen() with warning in QTRY_VERIFY(), which evaluates the condition
// multiple times
static bool fOpen(const QByteArray &fileName, const char *mode, FILE **file)
{
if (*file == nullptr)
*file = fopen(fileName.constData(), mode);
if (*file == nullptr)
qWarning("Cannot open %s: %s", fileName.constData(), strerror(errno));
return *file != nullptr;
}
void tst_QFile::largeUncFileSupport() void tst_QFile::largeUncFileSupport()
{ {
qint64 size = Q_INT64_C(8589934592); qint64 size = Q_INT64_C(8589934592);
@ -1629,15 +1650,18 @@ void tst_QFile::largeUncFileSupport()
QVERIFY2(file.exists(), msgFileDoesNotExist(largeFile)); QVERIFY2(file.exists(), msgFileDoesNotExist(largeFile));
QCOMPARE(file.size(), size); QCOMPARE(file.size(), size);
QVERIFY2(file.open(QIODevice::ReadOnly), msgOpenFailed(file).constData()); // Retry in case of sharing violation
QTRY_VERIFY2(qFileOpen(file, QIODevice::ReadOnly), msgOpenFailed(file).constData());
QCOMPARE(file.size(), size); QCOMPARE(file.size(), size);
QVERIFY(file.seek(dataOffset)); QVERIFY(file.seek(dataOffset));
QCOMPARE(file.read(knownData.size()), knownData); QCOMPARE(file.read(knownData.size()), knownData);
} }
{ {
// 2) stdlib file handling. // 2) stdlib file handling.
StdioFileGuard fh(fopen(largeFileEncoded.constData(), "rb")); FILE *fhF = nullptr;
QVERIFY(fh); // Retry in case of sharing violation
QTRY_VERIFY(fOpen(largeFileEncoded, "rb", &fhF));
StdioFileGuard fh(fhF);
QFile file; QFile file;
QVERIFY(file.open(fh, QIODevice::ReadOnly)); QVERIFY(file.open(fh, QIODevice::ReadOnly));
QCOMPARE(file.size(), size); QCOMPARE(file.size(), size);
@ -1646,8 +1670,10 @@ void tst_QFile::largeUncFileSupport()
} }
{ {
// 3) stdio file handling. // 3) stdio file handling.
StdioFileGuard fh(fopen(largeFileEncoded.constData(), "rb")); FILE *fhF = nullptr;
QVERIFY(fh); // Retry in case of sharing violation
QTRY_VERIFY(fOpen(largeFileEncoded, "rb", &fhF));
StdioFileGuard fh(fhF);
int fd = int(_fileno(fh)); int fd = int(_fileno(fh));
QFile file; QFile file;
QVERIFY(file.open(fd, QIODevice::ReadOnly)); QVERIFY(file.open(fd, QIODevice::ReadOnly));