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

Handle disk full situations by skipping QFile::moveToTrash test

Browse Source 
If any of the temporary directories and files can't be created, skip the
test. Otherwise, the cleanup routine would recursively delete "/".

Change-Id: I51f908a468be8fd2ebd523ff7ce27a7c78d1b4e2
Fixes: QTBUG-83863
Pick-to: 5.15
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-04-29 10:55:06 +02:00
parent a033c23ddf
commit 9b4b406142
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3677,11 +3677,14 @@ void tst_QFile::moveToTrash_data()
// success cases // success cases
{ {
QTemporaryFile temp; QTemporaryFile temp;
QVERIFY(temp.open()); if (!temp.open())
QSKIP("Failed to create temporary file!");
QTest::newRow("temporary file") << temp.fileName() << true << true; QTest::newRow("temporary file") << temp.fileName() << true << true;
} }
{ {
QTemporaryDir tempDir; QTemporaryDir tempDir;
if (!tempDir.isValid())
QSKIP("Failed to create temporary directory!");
tempDir.setAutoRemove(false); tempDir.setAutoRemove(false);
QTest::newRow("temporary dir") QTest::newRow("temporary dir")
<< tempDir.path() + QLatin1Char('/') << tempDir.path() + QLatin1Char('/')
@ -3689,10 +3692,13 @@ void tst_QFile::moveToTrash_data()
} }
{ {
QTemporaryDir homeDir(QDir::homePath() + QLatin1String("/XXXXXX")); QTemporaryDir homeDir(QDir::homePath() + QLatin1String("/XXXXXX"));
homeDir.setAutoRemove(false); if (!homeDir.isValid())
QSKIP("Failed to create temporary directory in $HOME!");
QTemporaryFile homeFile(homeDir.path() QTemporaryFile homeFile(homeDir.path()
+ QLatin1String("/tst_qfile-XXXXXX")); + QLatin1String("/tst_qfile-XXXXXX"));
homeFile.open(); if (!homeFile.open())
QSKIP("Failed to create temporary file in $HOME");
homeDir.setAutoRemove(false);
QTest::newRow("home file") QTest::newRow("home file")
<< homeFile.fileName() << homeFile.fileName()
<< true << true; << true << true;