From 40e8aeed892e268e3f0171f7987ace670b1c66d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Thu, 8 Oct 2015 11:38:37 +0200
Subject: [PATCH] fix tests settings and log path

---
 libguh/guhsettings.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp
index 162f7d4e..e955cc5c 100644
--- a/libguh/guhsettings.cpp
+++ b/libguh/guhsettings.cpp
@@ -71,7 +71,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
     case SettingsRoleDevices:
         // check if we are running a test
         if (settingsPrefix == "guh-test") {
-            settingsFile = settingsPrefix + "/test-devices";
+            settingsFile = "/tmp/" + settingsPrefix + "/test-devices.conf";
             m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
             qDebug() << "Created test-devices settings" << m_settings->fileName();
         } else if (rootPrivilege) {
@@ -87,7 +87,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
     case SettingsRoleRules:
         // check if we are running a test
         if (settingsPrefix == "guh-test") {
-            settingsFile = settingsPrefix + "/test-rules";
+            settingsFile = "/tmp/" + settingsPrefix + "/test-rules.conf";
             m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
             qDebug() << "Created test-rules settings" << m_settings->fileName();
         } else if (rootPrivilege) {
@@ -103,7 +103,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent):
     case SettingsRolePlugins:
         // check if we are running a test
         if (settingsPrefix == "guh-test") {
-            settingsFile = settingsPrefix + "/test-plugins";
+            settingsFile = "/tmp/" + settingsPrefix + "/test-plugins.conf";
             m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this);
             qDebug() << "Created test-plugins settings" << m_settings->fileName();
         } else if (rootPrivilege) {
@@ -159,7 +159,7 @@ QString GuhSettings::logPath()
     QString organisationName = QCoreApplication::instance()->organizationName();
 
     if (organisationName == "guh-test") {
-        logPath = "/tmp/guhd-test.log";
+        logPath = "/tmp/" + organisationName + "/guhd-test.logs";
     } else if (GuhSettings::isRoot()) {
         logPath = "/var/log/guhd.log";
     } else {