From 496f9fdaf1f171df777f5628767f7f71bf2e1bea Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 12 Feb 2019 08:15:05 -0500
Subject: [PATCH] [libcalamares] Fix tests
- The test wants to read settings.conf, but by default it's run
from way inside the build dir, where there is no such file.
Go looking for one (but not too far).
---
src/libcalamares/Tests.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp
index 102a18409d..e8566887de 100644
--- a/src/libcalamares/Tests.cpp
+++ b/src/libcalamares/Tests.cpp
@@ -62,9 +62,13 @@ void
LibCalamaresTests::testLoadSaveYaml()
{
QFile f( "settings.conf" );
+ // Find the nearest settings.conf to read
+ for ( unsigned int up = 0; !f.exists() && ( up < 4 ); ++up )
+ f.setFileName( QString( "../" ) + f.fileName() );
+ cDebug() << QDir().absolutePath() << f.fileName() << f.exists();
QVERIFY( f.exists() );
- auto map = CalamaresUtils::loadYaml( "settings.conf" );
+ auto map = CalamaresUtils::loadYaml( f.fileName() );
CalamaresUtils::saveYaml( "out.yaml", map );
auto other_map = CalamaresUtils::loadYaml( "out.yaml" );
--
GitLab