From 5dd470aca683e93976b314388e0d9f7d959db7a4 Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Thu, 1 Mar 2012 09:06:13 +1000 Subject: 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 --- tests/auto/corelib/io/qdir/tst_qdir.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto') 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,7 +1231,13 @@ 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", "")); -- cgit v1.2.3