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

[locale] Switch HTTP GET test to KDE servers

Browse Source 
- Use the official name of the KDE GeoIP service
 - Log the URL *before* the check, in case one fails
This commit is contained in:
Adriaan de Groot 2018-04-17 07:38:19 -04:00
parent 5acf67a057
commit 522adf766a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/locale/GeoIPTests.cpp
View File

@ -198,6 +198,8 @@ synchronous_get( const char* urlstring )
QNetworkAccessManager manager; QNetworkAccessManager manager;
QEventLoop loop; QEventLoop loop;
qDebug() << "Fetching" << url;
QObject::connect( &manager, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit ); QObject::connect( &manager, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit );
QNetworkRequest request( url ); QNetworkRequest request( url );
@ -211,7 +213,6 @@ synchronous_get( const char* urlstring )
{ \ { \
auto tz = GeoIP##t( selector ).processReply( synchronous_get( url ) ); \ auto tz = GeoIP##t( selector ).processReply( synchronous_get( url ) ); \
QCOMPARE( default_tz, tz ); \ QCOMPARE( default_tz, tz ); \
qDebug() << "Checked" << url; \
} }
void GeoIPTests::testGet() void GeoIPTests::testGet()
@ -223,9 +224,8 @@ void GeoIPTests::testGet()
} }
GeoIPJSON default_handler; GeoIPJSON default_handler;
// Call the KDE service the definitive source, even though this // Call the KDE service the definitive source.
// service is temporary and might go away any time. auto default_tz = default_handler.processReply( synchronous_get( "https://geoip.kde.org/v1/calamares" ) );
auto default_tz = default_handler.processReply( synchronous_get( "http://drax.kde.org:9129/calamares" ) );
// This is bogus, because the test isn't always run by me // This is bogus, because the test isn't always run by me
// QCOMPARE( default_tz.first, QLatin1String("Europe") ); // QCOMPARE( default_tz.first, QLatin1String("Europe") );
@ -236,17 +236,17 @@ void GeoIPTests::testGet()
// Each expansion of CHECK_GET does a synchronous GET, then checks that // Each expansion of CHECK_GET does a synchronous GET, then checks that
// the TZ data is the same as the default_tz; this is fragile if the // the TZ data is the same as the default_tz; this is fragile if the
// services don't agree on the location of where the test is run. // services don't agree on the location of where the test is run.
CHECK_GET( JSON, QString(), "http://drax.kde.org:9129/calamares" ) // Temporary KDE service CHECK_GET( JSON, QString(), "https://geoip.kde.org/v1/calamares" ) // Check it's consistent
CHECK_GET( JSON, QString(), "http://freegeoip.net/json/" ) // Original FreeGeoIP service CHECK_GET( JSON, QString(), "http://freegeoip.net/json/" ) // Original FreeGeoIP service
CHECK_GET( JSON, QLatin1String("timezone"), "https://ipapi.co/json" ) // Different JSON CHECK_GET( JSON, QLatin1String("timezone"), "https://ipapi.co/json" ) // Different JSON
CHECK_GET( JSON, QLatin1String("timezone"), "http://ip-api.com/json" ) CHECK_GET( JSON, QLatin1String("timezone"), "http://ip-api.com/json" )
CHECK_GET( JSON, QLatin1String("location.time_zone"), "http://geoip.nekudo.com/api/" ) // 2-level JSON CHECK_GET( JSON, QLatin1String("location.time_zone"), "http://geoip.nekudo.com/api/" ) // 2-level JSON
CHECK_GET( JSON, QLatin1String("Location.TimeZone"), "http://drax.kde.org:9129/" ) // 2-level JSON CHECK_GET( JSON, QLatin1String("Location.TimeZone"), "https://geoip.kde.org/debug" ) // 2-level JSON
#ifdef HAVE_XML #ifdef HAVE_XML
CHECK_GET( XML, QString(), "http://geoip.ubuntu.com/lookup" ) // Ubiquity's XML format CHECK_GET( XML, QString(), "http://geoip.ubuntu.com/lookup" ) // Ubiquity's XML format
CHECK_GET( XML, QString(), "http://drax.kde.org:9129/ubiquity" ) // Temporary KDE service CHECK_GET( XML, QString(), "https://geoip.kde.org/v1/ubiquity" ) // Temporary KDE service
#endif #endif
} }