From 2bc8f72dffa8c526dad2587acb8d9b3f138c3c80 Mon Sep 17 00:00:00 2001 From: Jake Dallimore Date: Tue, 31 Dec 2019 14:38:50 +0800 Subject: [PATCH] MDL-67593 core_iplookup: use MaxMind test database in unit tests Instead of downloading a live database (now not available publicly) use a local test database. --- iplookup/tests/fixtures/GeoIP2-City-Test.mmdb | Bin 0 -> 20831 bytes iplookup/tests/fixtures/README.txt | 10 ++++++ iplookup/tests/geoip_test.php | 48 ++------------------------ lib/maxmind/readme_moodle.txt | 2 +- 4 files changed, 14 insertions(+), 46 deletions(-) create mode 100644 iplookup/tests/fixtures/GeoIP2-City-Test.mmdb create mode 100644 iplookup/tests/fixtures/README.txt diff --git a/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb b/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb new file mode 100644 index 0000000000000000000000000000000000000000..c304794f62ff1c7e534a434eae6f7287a0a2f76f GIT binary patch literal 20831 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 literal 0 HcwPel00001 diff --git a/iplookup/tests/fixtures/README.txt b/iplookup/tests/fixtures/README.txt new file mode 100644 index 00000000000..f12faa2ac00 --- /dev/null +++ b/iplookup/tests/fixtures/README.txt @@ -0,0 +1,10 @@ +GeoIP2-City-Test.mmdb: + Copyright: maxmind (github.com/maxmind) + + https://github.com/maxmind/MaxMind-DB/blob/master/test-data/GeoIP2-City-Test.mmdb + + Licence: Creative Commons Attribution-ShareAlike 3.0 Unported License + + http://creativecommons.org/licenses/by-sa/3.0/ + + No changes have been made to this file. diff --git a/iplookup/tests/geoip_test.php b/iplookup/tests/geoip_test.php index b65be599621..d553bd8938a 100644 --- a/iplookup/tests/geoip_test.php +++ b/iplookup/tests/geoip_test.php @@ -36,56 +36,15 @@ require_once("{$CFG->dirroot}/iplookup/lib.php"); */ class core_iplookup_geoip_testcase extends advanced_testcase { public function setUp() { - if (!PHPUNIT_LONGTEST) { - // These tests are intensive and required downloads. - $this->markTestSkipped('PHPUNIT_LONGTEST is not defined'); - } - $this->resetAfterTest(); } - /** * Setup the GeoIP2File system. */ public function setup_geoip2file() { global $CFG; - - // Store the file somewhere where it won't be wiped out.. - $gzfile = "$CFG->dataroot/phpunit/geoip/GeoLite2-City.mmdb.gz"; - check_dir_exists(dirname($gzfile)); - if (file_exists($gzfile) and (filemtime($gzfile) < time() - 60*60*24*30)) { - // Delete file if older than 1 month. - unlink($gzfile); - } - - if (!file_exists($gzfile)) { - download_file_content('http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz', - null, null, false, 300, 20, false, $gzfile); - } - - $this->assertTrue(file_exists($gzfile)); - - $geoipfile = str_replace('.gz', '', $gzfile); - - // Open our files (in binary mode). - $file = gzopen($gzfile, 'rb'); - $geoipfilebuf = fopen($geoipfile, 'wb'); - - // Keep repeating until the end of the input file. - while (!gzeof($file)) { - // Read buffer-size bytes. - // Both fwrite and gzread and binary-safe. - fwrite($geoipfilebuf, gzread($file, 4096)); - } - - // Files are done, close files. - fclose($geoipfilebuf); - gzclose($file); - - $this->assertTrue(file_exists($geoipfile)); - - $CFG->geoip2file = $geoipfile; + $CFG->geoip2file = "$CFG->dirroot/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb"; } /** @@ -121,9 +80,8 @@ class core_iplookup_geoip_testcase extends advanced_testcase { */ public function ip_provider() { return [ - 'IPv4: Sample suggested by maxmind themselves' => ['24.24.24.24'], - 'IPv4: github.com' => ['192.30.255.112'], - 'IPv6: UCLA' => ['2607:f010:3fe:fff1::ff:fe00:25'], + 'IPv4: IPV4 test' => ['81.2.69.142'], + 'IPv6: IPV6 test' => ['2001:252:1::1:1:1'], ]; } } diff --git a/lib/maxmind/readme_moodle.txt b/lib/maxmind/readme_moodle.txt index e960210a053..ae756928512 100644 --- a/lib/maxmind/readme_moodle.txt +++ b/lib/maxmind/readme_moodle.txt @@ -27,4 +27,4 @@ unzip v1.1.3.zip mv GeoIP2-php-2.6.0/src/ /path/to/moodle/lib/maxmind/GeoIp2/ mv MaxMind-DB-Reader-php-1.1.3/src/MaxMind/ /path/to/moodle/lib/maxmind/MaxMind/ -4) Run unit tests on iplookup/tests/geoip_test.php with PHPUNIT_LONGTEST defined. +4) Run unit tests on iplookup/tests/geoip_test.php. -- 2.11.4.GIT