From kde-commits  Fri Oct 31 22:45:04 2014
From: David Faure <faure () kde ! org>
Date: Fri, 31 Oct 2014 22:45:04 +0000
To: kde-commits
Subject: [kio] src/ioslaves/trash/tests: Try to fix CI for testtrash, it's launching klauncher erroneously
Message-Id: <E1XkKwK-0004MO-HD () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=141479551608318

Git commit 89920462723dd3b91607953e6641936b0a7253d7 by David Faure.
Committed on 31/10/2014 at 22:44.
Pushed by dfaure into branch 'master'.

Try to fix CI for testtrash, it's launching klauncher erroneously

Change-Id: Ib68bfd71a1e0edccd21e9367824f16ce4dc57a54

M  +3    -3    src/ioslaves/trash/tests/testtrash.cpp

http://commits.kde.org/kio/89920462723dd3b91607953e6641936b0a7253d7

diff --git a/src/ioslaves/trash/tests/testtrash.cpp b/src/ioslaves/trash/te=
sts/testtrash.cpp
index 39e1118..e59b31a 100644
--- a/src/ioslaves/trash/tests/testtrash.cpp
+++ b/src/ioslaves/trash/tests/testtrash.cpp
@@ -133,8 +133,8 @@ static void removeDirRecursive(const QString &dir)
 =

 void TestTrash::initTestCase()
 {
-    qDebug() << qgetenv("LC_ALL");
-    setenv("KDE_FORK_SLAVES", "yes", true);
+    // To avoid a runtime dependency on klauncher
+    qputenv("KDE_FORK_SLAVES", "yes");
 =

     m_trashDir =3D QStandardPaths::writableLocation(QStandardPaths::Generi=
cDataLocation) + QString::fromLatin1("/Trash");
     qDebug() << "setup: using trash directory " << m_trashDir;
@@ -836,7 +836,7 @@ void TestTrash::copyDirectoryFromTrash()
     QVERIFY(QFile::exists(destPath + "/subdir/subfile"));
 }
 =

-void TestTrash::copySymlinkFromTrash()
+void TestTrash::copySymlinkFromTrash() // relies on trashSymlinkFromHome()=
 being called first
 {
     const QString destPath =3D otherTmpDir() + QString::fromLatin1("symlin=
kFromHome_copied");
     copyFromTrash(QString::fromLatin1("symlinkFromHome"), destPath);