From 16f695f8a83155f448c68b33c577ba52d25420a1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 10 Jun 2021 22:51:59 +0200 Subject: [PATCH] tst_qsettings: reliably remove the empty.ini file ... using QScopeGuard. Change-Id: I3693ca5e5ef32aa7ccabaa7e05a94bee69e0910b Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qsettings/tst_qsettings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 621214452bf..6186f5544bc 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -2177,6 +2177,8 @@ void tst_QSettings::testEmptyData() vList2 << emptyString << nullString; vList3 << QString("foo"); + const auto rm = QScopeGuard([=] { QFile::remove(filename); }); + { QSettings settings(filename, QSettings::IniFormat); settings.setValue("nullString", nullString); @@ -2230,7 +2232,6 @@ void tst_QSettings::testEmptyData() QCOMPARE(settings.value("vList3").toList(), vList3); QCOMPARE(settings.status(), QSettings::NoError); } - QFile::remove(filename); } void tst_QSettings::testEmptyKey()