From 67d2b5568d54a8cb2bcc42efb96a761987214561 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 26 Aug 2021 14:40:52 +0200 Subject: [PATCH] [welcome] Fix test, check that the internet check URLs are loaded --- src/modules/welcome/Tests.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp index eed7dae87..cc2b7b873 100644 --- a/src/modules/welcome/Tests.cpp +++ b/src/modules/welcome/Tests.cpp @@ -11,6 +11,7 @@ #include "Branding.h" #include "Settings.h" +#include "network/Manager.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include "utils/Yaml.h" @@ -57,7 +58,7 @@ WelcomeTests::testOneUrl() // BUILD_AS_TEST is the source-directory path QString filename = QStringLiteral( "1a-checkinternet.conf" ); - QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); + QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) ); QVERIFY( fi.exists() ); bool ok = false; @@ -65,6 +66,9 @@ WelcomeTests::testOneUrl() QVERIFY( ok ); QVERIFY( map.count() > 0 ); QVERIFY( map.contains( "requirements" ) ); + + c.setConfigurationMap( map ); + QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 ); }