napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Fix test, check that the internet check URLs are loaded

Browse Source
This commit is contained in:
Adriaan de Groot 2021-08-26 14:40:52 +02:00
parent 0538881447
commit 67d2b5568d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/welcome/Tests.cpp
View File

@ -11,6 +11,7 @@
#include "Branding.h" #include "Branding.h"
#include "Settings.h" #include "Settings.h"
#include "network/Manager.h"
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Yaml.h" #include "utils/Yaml.h"
@ -57,7 +58,7 @@ WelcomeTests::testOneUrl()
// BUILD_AS_TEST is the source-directory path // BUILD_AS_TEST is the source-directory path
QString filename = QStringLiteral( "1a-checkinternet.conf" ); 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() ); QVERIFY( fi.exists() );
bool ok = false; bool ok = false;
@ -65,6 +66,9 @@ WelcomeTests::testOneUrl()
QVERIFY( ok ); QVERIFY( ok );
QVERIFY( map.count() > 0 ); QVERIFY( map.count() > 0 );
QVERIFY( map.contains( "requirements" ) ); QVERIFY( map.contains( "requirements" ) );
c.setConfigurationMap( map );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 );
} }