diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-03-01 09:06:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 05:43:12 +0100 |
| commit | 5dd470aca683e93976b314388e0d9f7d959db7a4 (patch) | |
| tree | 95631ce53a381b975cf94cf01d0179444f7ebec5 /tests/auto/corelib | |
| parent | eafc667136c28fdde28d5dbc775ad978f888aa71 (diff) | |
Fixed qdir unittest rename() test to skip if run as root
- subtest not valid if run as root so added a check and skip
Change-Id: Iae993e20f272f9303a75062ef00d22b49df5e84a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index 04967d8313..ca01a1ec80 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -1231,8 +1231,14 @@ void tst_QDir::rename() QVERIFY(!dir.rename("rename-test", "/etc/rename-test-renamed")); #elif !defined(Q_OS_WIN) // on windows this is possible - maybe make the test a bit better +#ifdef Q_OS_UNIX + // not valid if run as root so skip if needed + if (::getuid() != 0) + QVERIFY(!dir.rename("rename-test", "/rename-test-renamed")); +#else QVERIFY(!dir.rename("rename-test", "/rename-test-renamed")); #endif +#endif QTest::ignoreMessage(QtWarningMsg, "QDir::rename: Empty or null file name(s)"); QVERIFY(!dir.rename("rename-test", "")); QTest::ignoreMessage(QtWarningMsg, "QDir::rename: Empty or null file name(s)"); |