applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[welcome] Fix up and expand tests

Browse source 
- improve logging
- fix failing tests -- the observed and expected behavior is
  to fill in a fallback check-URL, not change to an empty list,
- **except** if there's no requirements key in the config
  at all; this is a bit weird, but let's make the tests
  document existing behavior so we can notice if it changes.
This commit is contained in:
Adriaan de Groot 2021-09-06 12:35:24 +02:00
parent a1fce99a05
commit 6017420dde
2 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/modules/welcome/Tests.cpp
View file

@ -31,6 +31,8 @@ private Q_SLOTS:
void testOneUrl();
void testUrls_data();
void testUrls();
void testBadConfigDoesNotResetUrls();
};
WelcomeTests::WelcomeTests() {}
@ -81,9 +83,9 @@ WelcomeTests::testUrls_data()
QTest::newRow( "one " ) << QString( "1a-checkinternet.conf" ) << 1;
QTest::newRow( "none " ) << QString( "1b-checkinternet.conf" ) << 0;
QTest::newRow( "blank" ) << QString( "1c-checkinternet.conf" ) << 0;
QTest::newRow( "bogus" ) << QString( "1d-checkinternet.conf" ) << 0;
QTest::newRow( "[] " ) << QString( "1e-checkinternet.conf" ) << 0;
QTest::newRow( "blank" ) << QString( "1c-checkinternet.conf" ) << 1;
QTest::newRow( "bogus" ) << QString( "1d-checkinternet.conf" ) << 1;
QTest::newRow( "[] " ) << QString( "1e-checkinternet.conf" ) << 1;
QTest::newRow( "-3 " ) << QString( "1f-checkinternet.conf" ) << 3;
QTest::newRow( "[3] " ) << QString( "1g-checkinternet.conf" ) << 3;
QTest::newRow( "some " ) << QString( "1h-checkinternet.conf" ) << 3;
@ -105,10 +107,59 @@ WelcomeTests::testUrls()
const auto map = CalamaresUtils::loadYaml( fi, &ok );
QVERIFY( ok );
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 0 );
c.setConfigurationMap( map );
QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), result );
}
void
WelcomeTests::testBadConfigDoesNotResetUrls()
{
auto& nam = CalamaresUtils::Network::Manager::instance();
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
nam.setCheckHasInternetUrl( QVector< QUrl > { QUrl( "http://example.com" ), QUrl( "https://www.kde.org" ) } );
QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
Config c;
// This is slightly surprising: if there is **no** requirements
// configuration, the list of check-URLs is left unchanged.
{
const QString filename = QStringLiteral( "1b-checkinternet.conf" ); // "none"
// BUILD_AS_TEST is the source-directory path
QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
QVERIFY( fi.exists() );
bool ok = false;
const auto map = CalamaresUtils::loadYaml( fi, &ok );
QVERIFY( ok );
c.setConfigurationMap( map );
}
QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
// But if the config contains a requirements entry, even if broken,
// the list is changed (to the default).
{
const QString filename = QStringLiteral( "1d-checkinternet.conf" ); // "bogus"
// BUILD_AS_TEST is the source-directory path
QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
QVERIFY( fi.exists() );
bool ok = false;
const auto map = CalamaresUtils::loadYaml( fi, &ok );
QVERIFY( ok );
c.setConfigurationMap( map );
}
QCOMPARE( nam.getCheckInternetUrls().count(), 1 );
}
QTEST_GUILESS_MAIN( WelcomeTests )
#include "utils/moc-warnings.h"

11
src/modules/welcome/checker/GeneralRequirements.cpp
View file

@ -215,7 +215,7 @@ GeneralRequirements::checkRequirements()
return checkEntries;
}
/** @brief Loads the check-internel URLs
/** @brief Loads the check-internet URLs
*
* There may be zero or one or more URLs specified; returns
* @c true if the configuration is incomplete or damaged in some way.
@ -246,8 +246,8 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
if ( urls.empty() )
{
cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs,"
<< "reverting to default (http://example.com).";
cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs, "
<< "reverting to default (" << exampleUrl << ").";
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
incomplete = true;
}
@ -258,8 +258,9 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
}
else
{
cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf,"
"reverting to default (http://example.com).";
cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf, "
"reverting to default ("
<< exampleUrl << ").";
CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
incomplete = true;
}