commit 499841d69c75f6abc682e861bcc364760f2bc63f
parent 376c4a618fbf72b01e3b8c5329db6bcbd54043b4
Author: Frederic Cambus <fred@statdns.com>
Date: Fri, 28 Aug 2020 16:06:54 +0200
Add a new test case to exercise the IP geolocation codepaths.
This uses a custom MMDB database generated specially for this purpose.
Diffstat:
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
# https://www.logswan.org
#
# Created: 2015-05-31
-# Last Updated: 2020-06-09
+# Last Updated: 2020-08-28
#
# Logswan is released under the BSD 2-Clause license
# See LICENSE file for details
@@ -81,4 +81,6 @@ install(FILES logswan.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
enable_testing()
add_test(logswan logswan)
-add_test(processing logswan ${PROJECT_SOURCE_DIR}/examples/logswan.log)
+add_test(processing logswan ${PROJECT_SOURCE_DIR}/tests/logswan.log)
+add_test(geolocation logswan -g -d ${PROJECT_SOURCE_DIR}/tests/logswan.mmdb
+ ${PROJECT_SOURCE_DIR}/tests/logswan.log)
diff --git a/tests/logswan.log b/tests/logswan.log
@@ -0,0 +1,34 @@
+1.1.1.1 - - [09/Dec/2018:10:59:20 +0100] "HEAD / HTTP/1.1" 200 8142 "" "curl/7.62.0"
+1.1.1.1 - - [09/Dec/2018:10:59:26 +0100] "GET / HTTP/1.1" 200 8142 "" "curl/7.62.0"
+1.1.1.1 - - [09/Dec/2018:11:00:02 +0100] "GET /robots.txt HTTP/1.1" 404 0 "" "curl/7.62.0"
+1.1.1.1 - - [09/Dec/2018:11:06:22 +0100] "GET /assets/images/bkg.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+1.1.1.1 - - [09/Dec/2018:11:06:22 +0100] "GET /assets/images/blacktocat.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+1.1.1.1 - - [09/Dec/2018:11:06:23 +0100] "GET /favicon.ico HTTP/1.1" 404 0 "https://www.logswan.org/" "Mozilla/5.0 (X11; OpenBSD amd64; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+2.2.2.2 - - [09/Dec/2018:12:36:38 +0100] "GET /files/logswan-1.00.tar.gz HTTP/1.1" 200 14571 "" "curl/7.62.0"
+2.2.2.2 - - [09/Dec/2018:12:36:47 +0100] "GET /files/logswan-1.00.tar.gz HTTP/1.1" 200 14571 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:36:51 +0100] "GET /files/logswan-1.01.tar.gz HTTP/1.1" 200 14790 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:36:53 +0100] "GET /files/logswan-1.02.tar.gz HTTP/1.1" 200 14931 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:36:55 +0100] "GET /files/logswan-1.03.tar.gz HTTP/1.1" 200 16485 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:36:57 +0100] "GET /files/logswan-1.04.tar.gz HTTP/1.1" 200 16913 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:00 +0100] "GET /files/logswan-1.05.tar.gz HTTP/1.1" 200 17392 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:02 +0100] "GET /files/logswan-1.06.tar.gz HTTP/1.1" 200 17589 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:05 +0100] "GET /files/logswan-1.07.tar.gz HTTP/1.1" 200 18697 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:13 +0100] "GET /files/logswan-2.0.0.tar.gz HTTP/1.1" 200 20683 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:16 +0100] "GET /files/logswan-2.0.1.tar.gz HTTP/1.1" 200 21336 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:18 +0100] "GET /files/logswan-2.0.2.tar.gz HTTP/1.1" 200 21367 "" "Wget/1.19.5 (openbsd6.4)"
+2.2.2.2 - - [09/Dec/2018:12:37:21 +0100] "GET /files/logswan-2.0.3.tar.gz HTTP/1.1" 200 21799 "" "Wget/1.19.5 (openbsd6.4)"
+3.3.3.3 - - [09/Dec/2018:13:16:24 +0100] "GET /assets/images/bkg.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+3.3.3.3 - - [09/Dec/2018:13:16:24 +0100] "GET /assets/images/blacktocat.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
+4.4.4.4 - - [09/Dec/2018:14:32:28 +0100] "GET / HTTP/1.1" 200 8142 "" "Mozilla/5.0 (X11; OpenBSD amd64; rv:63.0) Gecko/20100101 Firefox/63.0"
+4.4.4.4 - - [09/Dec/2018:14:32:29 +0100] "GET /assets/css/style.css HTTP/1.1" 200 5466 "https://www.logswan.org/" "Mozilla/5.0 (X11; OpenBSD amd64; rv:63.0) Gecko/20100101 Firefox/63.0"
+4.4.4.4 - - [09/Dec/2018:14:32:29 +0100] "GET /assets/images/bkg.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; rv:63.0) Gecko/20100101 Firefox/63.0"
+4.4.4.4 - - [09/Dec/2018:14:32:29 +0100] "GET /assets/images/blacktocat.png HTTP/1.1" 404 0 "https://www.logswan.org/assets/css/style.css" "Mozilla/5.0 (X11; OpenBSD amd64; rv:63.0) Gecko/20100101 Firefox/63.0"
+4.4.4.4 - - [09/Dec/2018:14:32:29 +0100] "GET /favicon.ico HTTP/1.1" 404 0 "" "Mozilla/5.0 (X11; OpenBSD amd64; rv:63.0) Gecko/20100101 Firefox/63.0"
+5.5.5.5 - - [09/Dec/2018:15:21:57 +0100] "GET / HTTP/1.0" 200 8142 "" "Lynx/2.8.9rel.1 libwww-FM/2.14 SSL-MM/1.4.1"
+6.6.6.6 - - [09/Dec/2018:16:49:12 +0100] "GET / HTTP/1.1" 200 8142 "https://www.logswan.org/" "Dillo/3.0.5"
+6.6.6.6 - - [09/Dec/2018:16:49:12 +0100] "GET /assets/css/style.css HTTP/1.1" 200 5466 "https://www.logswan.org/" "Dillo/3.0.5"
+7.7.7.7 - - [09/Dec/2018:18:17:29 +0100] "GET / HTTP/1.1" 200 8142 "" "NetSurf/3.8 (OpenBSD)"
+7.7.7.7 - - [09/Dec/2018:18:17:30 +0100] "GET /assets/css/style.css HTTP/1.1" 200 5466 "https://www.logswan.org/" "NetSurf/3.8 (OpenBSD)"
+7.7.7.7 - - [09/Dec/2018:18:17:30 +0100] "GET /assets/images/bkg.png HTTP/1.1" 404 0 "https://www.logswan.org/" "NetSurf/3.8 (OpenBSD)"
+7.7.7.7 - - [09/Dec/2018:18:17:30 +0100] "GET /assets/images/blacktocat.png HTTP/1.1" 404 0 "https://www.logswan.org/" "NetSurf/3.8 (OpenBSD)"
+7.7.7.7 - - [09/Dec/2018:18:17:31 +0100] "GET /favicon.ico HTTP/1.1" 404 0 "" "NetSurf/3.8 (OpenBSD)"
diff --git a/tests/logswan.mmdb b/tests/logswan.mmdb
Binary files differ.
