1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
From: =?utf-8?q?S=C3=A9bastien_Delafond?= <sdelafond@gmail.com>
Date: Thu, 7 Nov 2019 11:34:36 +0100
Subject: Do not test GeoIPCity
---
test/test.lua | 67 +----------------------------------------------------------
1 file changed, 1 insertion(+), 66 deletions(-)
diff --git a/test/test.lua b/test/test.lua
index d5cd635..922dd0d 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -6,10 +6,8 @@ local socket = require 'socket'
local geoip = require 'geoip'
local geoip_country = require 'geoip.country'
-local geoip_city = require 'geoip.city'
local geoip_country_filename = select(1, ...) or "./GeoIP.dat"
-local geoip_city_filename = select(2, ...) or "./GeoLiteCity.dat"
local geoip_country6_filename = select(3, ...) or "./GeoIPv6.dat"
print("TESTING lua-geoip")
@@ -22,15 +20,10 @@ print("VERSION: ", assert(geoip_country._VERSION))
print("DESCRIPTION: ", assert(geoip_country._DESCRIPTION))
print("COPYRIGHT: ", assert(geoip_country._COPYRIGHT))
print("")
-print("VERSION: ", assert(geoip_city._VERSION))
-print("DESCRIPTION: ", assert(geoip_city._DESCRIPTION))
-print("COPYRIGHT: ", assert(geoip_city._COPYRIGHT))
-print("")
-- Check that required files exist
-- See README on info on how to get them
assert(io.open(geoip_country_filename, "r")):close()
-assert(io.open(geoip_city_filename, "r")):close()
assert(io.open(geoip_country6_filename, "r")):close()
do
@@ -54,17 +47,6 @@ do
--assert(geoip_country.open(nil, 2 ^ 10) == nil) -- TODO: This should fail
--assert(geoip_country.open(nil, nil, -1) == nil) -- TODO: This should fail
-
- assert(geoip_country.open(geoip_city_filename) == nil)
-end
-
-do
- assert(geoip_city.open("./BADFILENAME") == nil)
-
- --assert(geoip_city.open(nil, 2 ^ 10) == nil) -- TODO: This should fail
- --assert(geoip_city.open(nil, nil, -1) == nil) -- TODO: This should fail
-
- assert(geoip_city.open(geoip_country_filename) == nil)
end
do
@@ -82,7 +64,6 @@ do
assert(geoip_country.open(nil, flag)):close()
assert(geoip_country.open(geoip_country_filename, flag)):close()
end
- assert(geoip_city.open(geoip_city_filename, flag)):close()
end
end
@@ -94,14 +75,6 @@ do
geodb:close()
end
-do
- local geodb = assert(
- geoip_city.open(geoip_city_filename)
- )
- geodb:close()
- geodb:close()
-end
-
do
local check_country = function(db, method, arg)
local id = assert(db[method](db, arg, "id"))
@@ -136,45 +109,14 @@ do
return select("#", ...), { ... }
end
- local check_city = function(db, method, arg)
- local keys =
- {
- "country_code";
- "country_code3";
- "country_name";
- "region";
- "city";
- "postal_code";
- "latitude";
- "longitude";
- "metro_code";
- "dma_code";
- "area_code";
- "charset";
- "continent_code";
- }
-
- local all = assert(db[method](db, arg))
-
- local nret, r = apack(db[method](db, arg, unpack(keys)))
- assert(nret == #keys)
-
- for i = 1, #keys do
- assert(r[i] == all[keys[i]])
- assert(r[i] == db[method](db, arg, keys[i]))
- end
- end
-
local geodb_country = assert(geoip_country.open(geoip_country_filename))
- local geodb_city = assert(geoip_city.open(geoip_city_filename))
local checkers =
{
[geodb_country] = check_country;
- [geodb_city] = check_city;
}
- for _, geodb in ipairs { geodb_country, geodb_city } do
+ for _, geodb in ipairs { geodb_country } do
local checker = checkers[geodb]
-- checker(geodb, "query_by_name", "google-public-dns-a.google.com")
@@ -183,7 +125,6 @@ do
end
geodb_country:close()
- geodb_city:close()
end
-- Country IPv6 Edition
@@ -208,12 +149,6 @@ local profiles =
file = geoip_country_filename;
field = "id";
};
- {
- name = "city";
- module = geoip_city;
- file = geoip_city_filename;
- field = "country_code";
- };
}
for i = 1, #profiles do
|
