From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 29 Feb 2012 23:06:13 +0000 (+1000)
Subject: Fixed qdir unittest rename() test to skip if run as root
X-Git-Tag: qt-v5.0.0-alpha1~654
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5dd470aca683e93976b314388e0d9f7d959db7a4;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 04967d8..ca01a1e 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)");