From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Nov 2013 11:18:09 +0000 (+0100)
Subject: Update tests tools
X-Git-Tag: AWSTATS_7_3~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab62b3a608d723c288c849bb5d0e31d76e42bf50;p=thirdparty%2FAWStats.git

Update tests tools
---

diff --git a/test/awstats/conf/awstats.testglobal.conf b/test/awstats/conf/awstats.testglobal.conf
index bf9c6a05..31836897 100644
--- a/test/awstats/conf/awstats.testglobal.conf
+++ b/test/awstats/conf/awstats.testglobal.conf
@@ -37,7 +37,7 @@
 # You can also use a pipe if log file come from a pipe.
 # Example: "gzip -d </var/log/apache/access.log.gz |"
 #
-LogFile="/media/DATA/Mes Developpements/awstats/test/log/__AWSTATS_CURRENT_CONFIG__.log"
+LogFile="/home/ldestailleur/git/awstats/test/log/testglobal.log"
 
 
 # Enter the log file type you want to analyze.
@@ -110,7 +110,7 @@ LogFormat="%host %other %logname %time1 %methodurl %code %bytesd %refererquot %u
 # Example: "C:/awstats_working_dir"
 # Default: "."          (means same directory as awstats.pl)
 #
-DirData="/media/DATA/Mes Developpements/awstats/test/awstats/result" 	
+DirData="/home/ldestailleur/git/awstats/test/awstats/result" 	
 
 # Relative or absolute web URL of your awstats.pl directory.
 # Usefull only when AWStats is used from command line.
@@ -121,7 +121,7 @@ DirCgi="/cgi-bin"
 # Relative or absolute web URL of all icons subdirectories.
 # Default: "/icon" (means you must copy icons directories in "/wwwroot/icon")
 #
-DirIcons="/media/DATA/Mes Developpements/awstats/wwwroot/icon"
+DirIcons="/home/ldestailleur/git/awstats/wwwroot/icon"
 
 # If host names are already resolved in your logfile, set this to 0 will
 # increase performances.
@@ -195,7 +195,7 @@ PurgeLogFile=0
 ArchiveLogRecords=0
 
 
-# MiscTrackerUrl can be used to make AWStats able to detect some miscellanous
+# MiscTrackerUrl can be used to make AWStats able to detect some miscellaneous
 # things, that can not be tracked on other way like:
 # - Screen size
 # - Color depth
@@ -706,7 +706,7 @@ IncludeInternalLinksInOriginSection=1
 # table with country name
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIP.dat"
+LoadPlugin="geoip GEOIP_STANDARD /home/ldestailleur/git/awstats/test/maxmind/GeoIP.dat"
 
 # PLUGIN: GeoIP_City_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -715,7 +715,7 @@ LoadPlugin="geoip GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/aws
 # and hits by city including regions.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_city_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPCity-532.dat"
+LoadPlugin="geoip_city_maxmind GEOIP_STANDARD /home/ldestailleur/git/awstats/test/maxmind/GeoIPCity-532.dat"
 
 # PLUGIN: GeoIP_ASN_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -735,7 +735,7 @@ LoadPlugin="geoip_city_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/aws
 # Canada can be detected.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPRegion-515.dat"
+LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /home/ldestailleur/git/awstats/test/maxmind/GeoIPRegion-515.dat"
 
 # PLUGIN: GeoIP_ISP_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -743,7 +743,7 @@ LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/a
 # DESCRIPTION: This plugin adds a chart of hits by ISP.
 # Replace spaces in the path of geoip data file with string "%20".
 #
-#LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPISP-122.dat"
+#LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD /home/ldestailleur/git/awstats/test/maxmind/GeoIPISP-122.dat"
 
 # PLUGIN: GeoIP_Org_Maxmind
 # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
@@ -751,7 +751,7 @@ LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/a
 # DESCRIPTION: This plugin add a chart of hits by Organization name
 # Replace spaces in the path of geoip data file with string "%20".
 #
-LoadPlugin="geoip_org_maxmind GEOIP_STANDARD /media/DATA/Mes Developpements/awstats/test/awstats/maxmind/GeoIPOrg-111.dat"
+LoadPlugin="geoip_org_maxmind GEOIP_STANDARD /home/ldestailleur/git/awstats/test/maxmind/GeoIPOrg-111.dat"
 
 
 
diff --git a/test/log/testglobal.log b/test/log/testglobal.log
index 305ee634..30f846c3 100644
--- a/test/log/testglobal.log
+++ b/test/log/testglobal.log
@@ -1,16 +1,20 @@
 # This is a sample of log file that contains a lot of various data we can find
 # in a log file. Great sample to test reliability and accuracy of any log
 # analyzer.
+#
+# To prepare test: apt-get install libperl-geoip
+# To run test: test.pl
+# To run test: perl '/home/ldestailleur/git/awstats/wwwroot/cgi-bin/awstats.pl' -config=/home/ldestailleur/git/awstats/test/awstats/conf/awstats.testglobal.conf --debug=3
 # ----------------------------------------------------------------------------
-# This sample log file contains 12 differents IPs that are :
-# Viewed traffic: 7 different true human visitors making 8 human visits
-# 23 hits on pages and 15 hits not pages (38 hits)
-# Not viewed traffic: 11 pages (7 from 80.8.55.5, 1 worm, 3 special status code) , 15 hits
+# This sample log file contains 13 different IPs that are :
+# Viewed traffic:     8 different true human visitors making 9 human visits
+#                     24 hits on pages and 15 hits not pages (39 hits)
+# Not viewed traffic: 11 pages (7 from 80.8.55.5, 1 worm, 3 special status code), 15 hits
 # ----------------------------------------------------------------------------
 # 80.8.55.1  2 visits (start at 00:00:00 and at 12:00:00 with both entry page on /)
-#            And 2 hits to add favourites but first is non root hit with error meaning it's same "add"
+#            And 2 hits to add favorites but first is non root hit with error meaning it's same "add"
 # 80.8.55.2  Not a visit, only an image included into a page of an other site
-# 80.8.55.3  1 visit (and add home page to favourites)
+# 80.8.55.3  1 visit (and add home page to favorites)
 # 80.8.55.4  same visitor than 80.8.55.3 using aol proxy
 # 80.8.55.5  Not a visit (but bot indexing)
 # 80.8.55.6  1 visit (authenticated visitor)
@@ -20,6 +24,7 @@
 # 80.8.55.10 1 visit that come from a web page that is not a search engine
 # 80.8.55.11 1 visit that come from android phone
 # 80.8.55.12 1 visit that come from air
+# 80.8.55.13 1 visit that come from ie 11
 
 80.8.55.1 - - [01/Jan/2001:00:00:10 +0100] "GET /page1.html HTTP/1.0" 200 7009 "-" "Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)"
 80.8.55.1 - - [01/Jan/2001:00:00:00 +0100] "GET / HTTP/1.0" 200 7009 "http://www.sitereferer/cgi-bin/search.pl?q=a" "Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)"
@@ -88,3 +93,5 @@
 80.8.55.11 - - [01/Jan/2001:16:30:00 -0300] "GET /page1.html HTTP/1.1" 200 70476 "-" "Mozilla/5.0 (Linux; U; Android 1.5; en-us; sdk Build/CUPCAKE) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1"
 
 80.8.55.12 - - [01/Jan/2001:16:30:00 -0300] "GET /page1.html HTTP/1.1" 200 70476 "-" "Mozilla/5.0 (Windows; U; en-US) AppleWebKit/526.9+ (KHTML, like Gecko) AdobeAIR/1.5"
+
+80.8.55.13 - - [01/Jan/2001:16:30:00 -0300] "GET /page1.html HTTP/1.1" 200 70476 "-" "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko"
diff --git a/test/test.pl b/test/test.pl
old mode 100644
new mode 100755
index ed766123..91accd4f
--- a/test/test.pl
+++ b/test/test.pl
@@ -4,9 +4,9 @@
 #-----------------------------------------------------------------------------
 
 
-$DIRAWSTATS="/media/HDDATA1_LD/Mes Developpements/awstats/wwwroot/cgi-bin";
-$DIRCONF="/media/HDDATA1_LD/Mes Developpements/awstats/test/awstats/conf";
-$DIRRESULT="/media/HDDATA1_LD/Mes Developpements/awstats/test/awstats/result";
+$DIRAWSTATS="/home/ldestailleur/git/awstats/wwwroot/cgi-bin";
+$DIRCONF="/home/ldestailleur/git/awstats/test/awstats/conf";
+$DIRRESULT="/home/ldestailleur/git/awstats/test/awstats/result";
 $TEMP="/temp";
 #$PERL="\"c:\\Program files\\cygwin\\bin\\perl.exe\"";
 $PERL="perl";
@@ -106,7 +106,7 @@ while(1==1)
 	else { push @choosed, $TESTLIST[$bidon-1]; }
 	
 	# Option output
-	print "Choose output option (browserdetail)...\n";
+	print "Choose output option (browserdetail, osdetail, ...)\n";
 	$bidon='';
 	print "Your choice : ";
 	$bidon=<STDIN>;