launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:testfix-drop-geoip-legacy into launchpad:master.

Commit message:
Add a few more IP ranges used by the test suite

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/391586

This fixes lib/lp/translations/stories/standalone/xx-person-editlanguages.txt and lp.soyuz.scripts.tests.test_ppa_apache_log_parser.TestScriptRunning.test_script_run.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:testfix-drop-geoip-legacy into launchpad:master.

diff --git a/lib/lp/services/geoip/tests/data/make-db.pl b/lib/lp/services/geoip/tests/data/make-db.pl
index 279a99a..3139982 100755
--- a/lib/lp/services/geoip/tests/data/make-db.pl
+++ b/lib/lp/services/geoip/tests/data/make-db.pl
@@ -24,13 +24,16 @@ my $tree = MaxMind::DB::Writer::Tree->new(
     map_key_type_callback => sub { $types{$_[0]} },
     # Arguments are ($sec, $min, $hour, $mday, $mon, $year); $mon is
     # 0-based.  Bump this date when you change this script.
-    _build_epoch => timegm_modern(0, 38, 11, 29, 8, 2020),
+    _build_epoch => timegm_modern(0, 30, 23, 29, 8, 2020),
 );
 
 $tree->insert_network('69.232.0.0/15', { country => { iso_code => 'US' } });
+$tree->insert_network('80.66.224.0/20', { country => { iso_code => 'LI' } });
 $tree->insert_network('82.211.80.0/20', { country => { iso_code => 'GB' } });
 $tree->insert_network('83.196.40.0/21', { country => { iso_code => 'FR' } });
+$tree->insert_network('84.112.0.0/15', { country => { iso_code => 'AT' } });
 $tree->insert_network('121.44.0.0/15', { country => { iso_code => 'AU' } });
+$tree->insert_network('143.54.0.0/16', { country => { iso_code => 'BR' } });
 $tree->insert_network('157.92.0.0/16', { country => { iso_code => 'AR' } });
 $tree->insert_network('196.36.0.0/14', { country => { iso_code => 'ZA' } });
 $tree->insert_network('201.13.0.0/16', { country => { iso_code => 'BR' } });
diff --git a/lib/lp/services/geoip/tests/data/test.mmdb b/lib/lp/services/geoip/tests/data/test.mmdb
index 4d96205..a2e13d1 100644
Binary files a/lib/lp/services/geoip/tests/data/test.mmdb and b/lib/lp/services/geoip/tests/data/test.mmdb differ