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

tst_QSaveFile: QVERIFY the commit() return value in symlink() test

Browse Source 
It's kinda is important to verify that commit() worked; all the
follow-up tests assume it, so wrap the calls in QVERIFY().

Amends 7e5e7eeaa1418d959906cdf9d717c984c9fc7a7e.

Pick-to: 6.8 6.5 5.15
Change-Id: I01185d65a5ec06ed122e59c43d9cdcc3a7157259
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 97fe38ff0d1e60f92c0bfa6fb3571a0433e60352)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2025-01-09 14:20:41 +01:00 committed by Qt Cherry-pick Bot
parent b2dad9724d
commit 3660ff9ff8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
View File

@ -452,7 +452,7 @@ void tst_QSaveFile::symlink()
QSaveFile saveFile(linkFile); QSaveFile saveFile(linkFile);
QVERIFY(saveFile.open(QIODevice::WriteOnly)); QVERIFY(saveFile.open(QIODevice::WriteOnly));
QCOMPARE(saveFile.write(someData), someData.size()); QCOMPARE(saveFile.write(someData), someData.size());
saveFile.commit(); QVERIFY(saveFile.commit());
//Check that the linkFile is still a link and still has the same canonical path //Check that the linkFile is still a link and still has the same canonical path
QFileInfo info(linkFile); QFileInfo info(linkFile);
@ -471,7 +471,7 @@ void tst_QSaveFile::symlink()
QSaveFile saveFile(linkFile); QSaveFile saveFile(linkFile);
QVERIFY(saveFile.open(QIODevice::WriteOnly)); QVERIFY(saveFile.open(QIODevice::WriteOnly));
QCOMPARE(saveFile.write(someData), someData.size()); QCOMPARE(saveFile.write(someData), someData.size());
saveFile.commit(); QVERIFY(saveFile.commit());
QFileInfo info(linkFile); QFileInfo info(linkFile);
QVERIFY(info.isSymLink()); QVERIFY(info.isSymLink());
@ -497,7 +497,7 @@ void tst_QSaveFile::symlink()
QSaveFile saveFile(linkFile2); QSaveFile saveFile(linkFile2);
QVERIFY(saveFile.open(QIODevice::WriteOnly)); QVERIFY(saveFile.open(QIODevice::WriteOnly));
QCOMPARE(saveFile.write(someData), someData.size()); QCOMPARE(saveFile.write(someData), someData.size());
saveFile.commit(); QVERIFY(saveFile.commit());
QCOMPARE(saveFile.size(), someData.size()); QCOMPARE(saveFile.size(), someData.size());
QFile file(targetFile); QFile file(targetFile);
@ -512,7 +512,7 @@ void tst_QSaveFile::symlink()
QSaveFile saveFile(cyclicLink); QSaveFile saveFile(cyclicLink);
QVERIFY(saveFile.open(QIODevice::WriteOnly)); QVERIFY(saveFile.open(QIODevice::WriteOnly));
QCOMPARE(saveFile.write(someData), someData.size()); QCOMPARE(saveFile.write(someData), someData.size());
saveFile.commit(); QVERIFY(saveFile.commit());
QFile file(cyclicLink); QFile file(cyclicLink);
QVERIFY2(file.open(QIODevice::ReadOnly), msgCannotOpen(file).constData()); QVERIFY2(file.open(QIODevice::ReadOnly), msgCannotOpen(file).constData());
@ -527,7 +527,7 @@ void tst_QSaveFile::symlink()
QSaveFile saveFile(cyclicLink + QLatin1Char('1')); QSaveFile saveFile(cyclicLink + QLatin1Char('1'));
QVERIFY(saveFile.open(QIODevice::WriteOnly)); QVERIFY(saveFile.open(QIODevice::WriteOnly));
QCOMPARE(saveFile.write(someData), someData.size()); QCOMPARE(saveFile.write(someData), someData.size());
saveFile.commit(); QVERIFY(saveFile.commit());
QCOMPARE(saveFile.size(), someData.size()); QCOMPARE(saveFile.size(), someData.size());
// the explicit file becomes a file instead of a link // the explicit file becomes a file instead of a link