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

tst_QFile::moveToTrash: use QDir::tempPath() for the rows w/ "temporary"

Browse Source 
Both QTemporaryFile and QTemporaryDir are documented to use the current
directory if given a pattern. That can be anything & arbitrary, so it
doesn't give us consistency in checking. Moreover, it might be a read-
only directory.

Drive-by fix the number of 'X'.

Task-number: QTBUG-117449
Change-Id: Ifeb6206a9fa04424964bfffd178841c44e9636a0
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit a40341366f8e5b50dc62ef21fb47ba18deb38c2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2023-09-25 14:32:51 -07:00 committed by Qt Cherry-pick Bot
parent e1ad387733
commit 8fa7b42ab1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3847,13 +3847,13 @@ void tst_QFile::moveToTrash_data()
// success cases // success cases
{ {
QTemporaryFile temp("tst_qfile-moveToTrash-XXXXX"); QTemporaryFile temp(QDir::tempPath() + "/tst_qfile-moveToTrash-XXXXXX");
if (!temp.open()) if (!temp.open())
QSKIP("Failed to create temporary file!"); QSKIP("Failed to create temporary file!");
QTest::newRow("temporary file") << temp.fileName() << true << true; QTest::newRow("temporary file") << temp.fileName() << true << true;
} }
{ {
QTemporaryDir tempDir("tst_qfile-moveToTrash-XXXXX"); QTemporaryDir tempDir(QDir::tempPath() + "/tst_qfile-moveToTrash-XXXXXX");
if (!tempDir.isValid()) if (!tempDir.isValid())
QSKIP("Failed to create temporary directory!"); QSKIP("Failed to create temporary directory!");
tempDir.setAutoRemove(false); tempDir.setAutoRemove(false);