tst_QSaveFile: QVERIFY the commit() return value in symlink() test
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.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> (cherry picked from commit 3660ff9ff88a69ce9f1366e5870f6aa0323f1fda)
This commit is contained in:
parent
6f38ff4ba5
commit
e843e299a3
@ -424,7 +424,7 @@ void tst_QSaveFile::symlink()
|
||||
QSaveFile saveFile(linkFile);
|
||||
QVERIFY(saveFile.open(QIODevice::WriteOnly));
|
||||
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
|
||||
QFileInfo info(linkFile);
|
||||
@ -443,7 +443,7 @@ void tst_QSaveFile::symlink()
|
||||
QSaveFile saveFile(linkFile);
|
||||
QVERIFY(saveFile.open(QIODevice::WriteOnly));
|
||||
QCOMPARE(saveFile.write(someData), someData.size());
|
||||
saveFile.commit();
|
||||
QVERIFY(saveFile.commit());
|
||||
|
||||
QFileInfo info(linkFile);
|
||||
QVERIFY(info.isSymLink());
|
||||
@ -469,7 +469,7 @@ void tst_QSaveFile::symlink()
|
||||
QSaveFile saveFile(linkFile2);
|
||||
QVERIFY(saveFile.open(QIODevice::WriteOnly));
|
||||
QCOMPARE(saveFile.write(someData), someData.size());
|
||||
saveFile.commit();
|
||||
QVERIFY(saveFile.commit());
|
||||
QCOMPARE(saveFile.size(), someData.size());
|
||||
|
||||
QFile file(targetFile);
|
||||
@ -484,7 +484,7 @@ void tst_QSaveFile::symlink()
|
||||
QSaveFile saveFile(cyclicLink);
|
||||
QVERIFY(saveFile.open(QIODevice::WriteOnly));
|
||||
QCOMPARE(saveFile.write(someData), someData.size());
|
||||
saveFile.commit();
|
||||
QVERIFY(saveFile.commit());
|
||||
|
||||
QFile file(cyclicLink);
|
||||
QVERIFY2(file.open(QIODevice::ReadOnly), msgCannotOpen(file).constData());
|
||||
@ -499,7 +499,7 @@ void tst_QSaveFile::symlink()
|
||||
QSaveFile saveFile(cyclicLink + QLatin1Char('1'));
|
||||
QVERIFY(saveFile.open(QIODevice::WriteOnly));
|
||||
QCOMPARE(saveFile.write(someData), someData.size());
|
||||
saveFile.commit();
|
||||
QVERIFY(saveFile.commit());
|
||||
QCOMPARE(saveFile.size(), someData.size());
|
||||
|
||||
// the explicit file becomes a file instead of a link
|
||||
|
Loading…
x
Reference in New Issue
Block a user