Fixes for tst_QTemporary(File|Dir)::nonWritableCurrentDir

- Check path/fileName is empty upon failure, variable was unused
- Use /home instead of /, as / is writable by admins on Mac

Change-Id: I705471fda8b73843e98b30eb52aa0a73634ec075
Reviewed-by: David Faure <faure@kde.org>
bb10
João Abecasis 2011-12-08 15:51:19 +01:00 committed by Qt by Nokia
parent 4222603f8e
commit d8374aebc6
2 changed files with 4 additions and 6 deletions

View File

@ -238,14 +238,13 @@ void tst_QTemporaryDir::nonWritableCurrentDir()
};
ChdirOnReturn cor(QDir::currentPath());
QDir::setCurrent("/");
QDir::setCurrent("/home");
// QTemporaryDir("tempXXXXXX") is probably a bad idea in any app
// where the current dir could anything...
QString fileName;
QTemporaryDir dir("tempXXXXXX");
dir.setAutoRemove(true);
QVERIFY(!dir.isValid());
fileName = dir.path();
QVERIFY(dir.path().isEmpty());
#endif
}

View File

@ -266,14 +266,13 @@ void tst_QTemporaryFile::nonWritableCurrentDir()
};
ChdirOnReturn cor(QDir::currentPath());
QDir::setCurrent("/");
QDir::setCurrent("/home");
// QTemporaryFile("tempXXXXXX") is probably a bad idea in any app
// where the current dir could anything...
QString fileName;
QTemporaryFile file("tempXXXXXX");
file.setAutoRemove(true);
QVERIFY(!file.open());
fileName = file.fileName();
QVERIFY(file.fileName().isEmpty());
#endif
}