From 3660ff9ff88a69ce9f1366e5870f6aa0323f1fda Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 9 Jan 2025 14:20:41 +0100 Subject: [PATCH] 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.8 6.5 5.15 Change-Id: I01185d65a5ec06ed122e59c43d9cdcc3a7157259 Reviewed-by: Volker Hilsheimer Reviewed-by: Thiago Macieira (cherry picked from commit 97fe38ff0d1e60f92c0bfa6fb3571a0433e60352) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp index 54f8a13d6c1..458cdece514 100644 --- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp +++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp @@ -452,7 +452,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); @@ -471,7 +471,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()); @@ -497,7 +497,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); @@ -512,7 +512,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()); @@ -527,7 +527,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