From 63f1ce69c474824e897ae421be68d057b8b5da14 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 5 Feb 2014 09:52:12 +1300
Subject: [PATCH] Fixes #4628 --enable-bots now works as expected + our
importLogs integration test shows that this wasn't working before.
---
misc/log-analytics/import_logs.py | 11 ++++--
...rtLogs__Actions.getEntryPageUrls_month.xml | 18 ++++-----
...ortLogs__Actions.getExitPageUrls_month.xml | 18 ++++-----
...mportLogs__Actions.getPageTitles_month.xml | 6 +--
..._ImportLogs__Actions.getPageUrls_month.xml | 18 ++++-----
.../test_ImportLogs__Actions.get_month.xml | 4 +-
...stomVariables.getCustomVariables_month.xml | 38 +++++++++++++++++++
...tLogs__DevicesDetection.getBrand_month.xml | 10 ++---
...icesDetection.getBrowserFamilies_month.xml | 10 ++---
...icesDetection.getBrowserVersions_month.xml | 22 +++++------
...tLogs__DevicesDetection.getModel_month.xml | 10 ++---
...__DevicesDetection.getOsFamilies_month.xml | 18 ++++-----
...__DevicesDetection.getOsVersions_month.xml | 11 ++++++
...rtLogs__DevicesDetection.getType_month.xml | 10 ++---
...tLogs__Goals.getDaysToConversion_month.xml | 2 +-
...__Goals.getVisitsUntilConversion_month.xml | 2 +-
.../test_ImportLogs__Goals.get_month.xml | 8 ++--
...st_ImportLogs__MultiSites.getAll_month.xml | 8 ++--
...st_ImportLogs__MultiSites.getOne_month.xml | 8 ++--
...ImportLogs__Provider.getProvider_month.xml | 10 ++---
...tLogs__Referrers.getReferrerType_month.xml | 18 ++++-----
..._ImportLogs__UserCountry.getCity_month.xml | 18 ++++-----
...rtLogs__UserCountry.getContinent_month.xml | 18 ++++-----
...portLogs__UserCountry.getCountry_month.xml | 18 ++++-----
...mportLogs__UserCountry.getRegion_month.xml | 18 ++++-----
...ogs__UserSettings.getBrowserType_month.xml | 10 ++---
...__UserSettings.getBrowserVersion_month.xml | 24 ++++++------
...ortLogs__UserSettings.getBrowser_month.xml | 10 ++---
...s__UserSettings.getConfiguration_month.xml | 20 +++++-----
...rtLogs__UserSettings.getLanguage_month.xml | 10 ++---
..._UserSettings.getMobileVsDesktop_month.xml | 18 ++++-----
...rtLogs__UserSettings.getOSFamily_month.xml | 18 ++++-----
...t_ImportLogs__UserSettings.getOS_month.xml | 22 +++++------
...portLogs__UserSettings.getPlugin_month.xml | 14 +++----
...Logs__UserSettings.getResolution_month.xml | 10 ++---
...Logs__UserSettings.getWideScreen_month.xml | 10 ++---
...rtLogs__VisitTime.getByDayOfWeek_month.xml | 10 ++---
....getVisitInformationPerLocalTime_month.xml | 10 ++---
...getVisitInformationPerServerTime_month.xml | 18 ++++-----
...getNumberOfVisitsByDaysSinceLast_month.xml | 2 +-
...st.getNumberOfVisitsByVisitCount_month.xml | 2 +-
...nterest.getNumberOfVisitsPerPage_month.xml | 2 +-
...etNumberOfVisitsPerVisitDuration_month.xml | 2 +-
...rtLogs__VisitsSummary.getActions_month.xml | 2 +-
...gs__VisitsSummary.getBounceCount_month.xml | 2 +-
..._VisitsSummary.getUniqueVisitors_month.xml | 2 +-
...VisitsSummary.getVisitsConverted_month.xml | 2 +-
...ortLogs__VisitsSummary.getVisits_month.xml | 2 +-
...st_ImportLogs__VisitsSummary.get_month.xml | 14 +++----
...ancedAndLast7__MultiSites.getAll_month.xml | 20 +++++-----
.../access-logs/fake_logs_enable_all.log | 3 ++
51 files changed, 323 insertions(+), 268 deletions(-)
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 6a417acd8d..7909edcf04 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -1239,11 +1239,14 @@ class Recorder(object):
if hit.is_download:
args['download'] = args['url']
- if hit.is_robot:
- args['_cvar'] = '{"1":["Bot","%s"]}' % hit.user_agent
- elif config.options.enable_bots:
- args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
+
+ if config.options.enable_bots:
args['bots'] = '1'
+ if hit.is_robot:
+ args['_cvar'] = '{"1":["Bot","%s"]}' % hit.user_agent
+ else:
+ args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
+
if hit.is_error or hit.is_redirect:
args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
args['action_name'] = '%s/URL = %s%s' % (
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 441a7514ee..8845a80655 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -372,17 +372,17 @@
</row>
<row>
<label>/index</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index ac3907ad22..28acca1242 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -372,17 +372,17 @@
</row>
<row>
<label>/index</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index cbb38487ea..143229b5e7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>19</nb_visits>
- <nb_hits>19</nb_hits>
+ <nb_visits>20</nb_visits>
+ <nb_hits>20</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_daily_nb_uniq_visitors>19</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 23dac54cc0..c3f7304c25 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -372,17 +372,17 @@
</row>
<row>
<label>/index</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
index 1870fb5eb1..1f9e1351ba 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>25</nb_pageviews>
- <nb_uniq_pageviews>25</nb_uniq_pageviews>
+ <nb_pageviews>26</nb_pageviews>
+ <nb_uniq_pageviews>26</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index e87a6fb191..df0aed8239 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -114,6 +114,44 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Bot</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>Googlebot/2.1 ( http://www.googlebot.com/bot.html)</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Forum status</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index e1e5f0e71b..2a4ba83f06 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
<logo>plugins/DevicesDetection/images/brand/unknown.ico</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index f0a0faf700..c8cf2933a2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -24,13 +24,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>6</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 80ef44cb99..5285329934 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -78,18 +78,18 @@
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
</row>
<row>
- <label>Chrome 11.0</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <bounce_count>2</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
</row>
<row>
- <label>Internet Explorer 6.0</label>
+ <label>Chrome 11.0</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<max_actions>1</max_actions>
@@ -97,17 +97,17 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Unknown</label>
+ <label>Internet Explorer 6.0</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
+ <nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index 8e751c211d..09ce9b347f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Vision</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 4410cb7e13..9c860ec825 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -34,25 +34,25 @@
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
</row>
<row>
- <label>Android</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <label>Unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>3</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/UNK.gif</logo>
</row>
<row>
- <label>Unknown</label>
+ <label>Android</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/os/AND.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 5ca9da3cab..f0f2c3f196 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -77,4 +77,15 @@
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 169a5efaaf..bc13cbdb12 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index 8eba803a70..1ba1449d50 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>23</nb_conversions>
+ <nb_conversions>24</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 9b53257aa2..0a94d5f36d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>24</nb_conversions>
+ <nb_conversions>25</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
index fc5249168e..fc80cf81c0 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>24</nb_conversions>
- <nb_visits_converted>24</nb_visits_converted>
- <conversion_rate>92.31</conversion_rate>
- <revenue>120</revenue>
+ <nb_conversions>25</nb_conversions>
+ <nb_visits_converted>25</nb_visits_converted>
+ <conversion_rate>92.59</conversion_rate>
+ <revenue>125</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
index 8a400626b7..231e87eb8d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_pageviews>25</nb_pageviews>
- <revenue>120</revenue>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
+ <nb_pageviews>26</nb_pageviews>
+ <revenue>125</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
index febd0b7d2f..1fb93e2a2a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
- <nb_pageviews>25</nb_pageviews>
- <revenue>120</revenue>
+ <nb_pageviews>26</nb_pageviews>
+ <revenue>125</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
index 3197c887ed..3ac22f787e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>24</bounce_count>
- <nb_visits_converted>24</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>25</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
<url>http://piwik.org/faq/general/#faq_52</url>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 6d425f1aef..c580231b96 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
+ <bounce_count>23</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>22</nb_conversions>
- <nb_visits_converted>22</nb_visits_converted>
- <revenue>110</revenue>
+ <nb_conversions>23</nb_conversions>
+ <nb_visits_converted>23</nb_visits_converted>
+ <revenue>115</revenue>
</row>
</goals>
- <nb_conversions>22</nb_conversions>
- <revenue>110</revenue>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <nb_conversions>23</nb_conversions>
+ <revenue>115</revenue>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Websites</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 1f6e380d6b..267e90de6f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -27,21 +27,21 @@
</row>
<row>
<label>Ashburn, Virginia, United States</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>4</nb_conversions>
- <nb_visits_converted>4</nb_visits_converted>
- <revenue>20</revenue>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
</row>
</goals>
- <nb_conversions>4</nb_conversions>
- <revenue>20</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<lat>39.044</lat>
<long>-77.488</long>
<city_name>Ashburn</city_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 676b277cea..bb4a48d22d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -40,21 +40,21 @@
</row>
<row>
<label>North America</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>4</nb_conversions>
- <nb_visits_converted>4</nb_visits_converted>
- <revenue>20</revenue>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
</row>
</goals>
- <nb_conversions>4</nb_conversions>
- <revenue>20</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<code>North America</code>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index f0caed4f4a..eb13f78f0f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -46,21 +46,21 @@
</row>
<row>
<label>United States</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>4</nb_conversions>
- <nb_visits_converted>4</nb_visits_converted>
- <revenue>20</revenue>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
</row>
</goals>
- <nb_conversions>4</nb_conversions>
- <revenue>20</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<code>us</code>
<logo>plugins/UserCountry/images/flags/us.png</logo>
<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 3ff8f54d91..c4c562795c 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -25,21 +25,21 @@
</row>
<row>
<label>Virginia, United States</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>4</nb_conversions>
- <nb_visits_converted>4</nb_visits_converted>
- <revenue>20</revenue>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
</row>
</goals>
- <nb_conversions>4</nb_conversions>
- <revenue>20</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<region>VA</region>
<country>us</country>
<country_name>United States</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index cabfa2b9f0..7ecb163f87 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -13,13 +13,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>8</nb_visits>
- <nb_actions>11</nb_actions>
+ <nb_visits>9</nb_visits>
+ <nb_actions>12</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<shortLabel>Unknown</shortLabel>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index fbdb338d52..dfada1bb89 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -84,6 +84,18 @@
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
<shortLabel>Firefox 6.0</shortLabel>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <shortLabel>Unknown</shortLabel>
+ </row>
<row>
<label>Chrome 11.0</label>
<nb_visits>1</nb_visits>
@@ -108,16 +120,4 @@
<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
<shortLabel>Internet Explorer 6.0</shortLabel>
</row>
- <row>
- <label>Unknown</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
- <shortLabel>Unknown</shortLabel>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 047d025c03..95f3291088 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -68,13 +68,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 3aa7e6c0ec..aceff791de 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -50,6 +50,16 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
+ <row>
+ <label>Unknown / Unknown / unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
<row>
<label>Windows 7 / Chrome / unknown</label>
<nb_visits>2</nb_visits>
@@ -90,16 +100,6 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
- <row>
- <label>Unknown / Unknown / unknown</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
<row>
<label>Windows XP / Chrome / 1280x800</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 657fe9d857..fd38898a64 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,12 +2,12 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>24</bounce_count>
- <nb_visits_converted>24</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>25</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index c7854ca4fa..c6f19aed29 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -12,25 +12,25 @@
<logo>plugins/UserSettings/images/screens/normal.gif</logo>
</row>
<row>
- <label>Mobile</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <label>Unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>3</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/screens/mobile.gif</logo>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/UNK.gif</logo>
</row>
<row>
- <label>Unknown</label>
+ <label>Mobile</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/screens/mobile.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index c73b95cec1..66c8dbd1d4 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -34,25 +34,25 @@
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
</row>
<row>
- <label>Android</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <label>Unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>3</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/UNK.gif</logo>
</row>
<row>
- <label>Unknown</label>
+ <label>Android</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/os/AND.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
index 4f2575833c..d51312b003 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -37,28 +37,28 @@
<shortLabel>Mac OS</shortLabel>
</row>
<row>
- <label>Android</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <label>Unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>3</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
- <shortLabel>Android</shortLabel>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <shortLabel>Unknown</shortLabel>
</row>
<row>
- <label>Unknown</label>
+ <label>Android</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
- <shortLabel>Unknown</shortLabel>
+ <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <shortLabel>Android</shortLabel>
</row>
<row>
<label>Windows XP</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index d1f2bda02f..7079af5413 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -3,43 +3,43 @@
<row>
<label>Cookie</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>9.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
<label>Flash</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>9.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
<label>Java</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>9.5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
<label>Director</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4.8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
<label>Gears</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4.8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
<label>Pdf</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4.8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Windowsmedia</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4.8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 5240789b82..2ba37987cc 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>1024x768</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
index dafbcf6e3a..685578ed44 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>24</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_visits>25</nb_visits>
+ <nb_actions>28</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>22</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>23</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index a95e7420bb..4dd0cef2d8 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -42,12 +42,12 @@
</row>
<row>
<label>Saturday</label>
- <nb_visits>9</nb_visits>
- <nb_uniq_visitors>9</nb_uniq_visitors>
- <nb_actions>12</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_uniq_visitors>10</nb_uniq_visitors>
+ <nb_actions>13</nb_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>7</nb_visits_converted>
+ <bounce_count>8</bounce_count>
+ <nb_visits_converted>8</nb_visits_converted>
<day_of_week>6</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index e22dcdf840..5c585c10cc 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -172,13 +172,13 @@
</row>
<row>
<label>17h</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>18h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index c0bde3aaf6..8662f1ca3d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -226,22 +226,22 @@
</row>
<row>
<label>17h</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>3</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
<goals>
<row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>5</revenue>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
</row>
</goals>
- <nb_conversions>1</nb_conversions>
- <revenue>5</revenue>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>18h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 2f0f22356d..c47de22fc4 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>25</nb_visits>
+ <nb_visits>26</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 7b04c38302..0830ca0d10 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>26</nb_visits>
+ <nb_visits>27</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 42b73b8c2d..4e6a9ab29e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>24</nb_visits>
+ <nb_visits>25</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index ab8f9b4b1c..a64c14a967 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>24</nb_visits>
+ <nb_visits>25</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 46af1425a3..3fb9469667 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>29</result>
\ No newline at end of file
+<result>30</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 5154fe8a28..4c77f1f6e6 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>24</result>
\ No newline at end of file
+<result>25</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 8dda442ff2..40bd2e592a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>26</result>
\ No newline at end of file
+<result>27</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 5154fe8a28..4c77f1f6e6 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>24</result>
\ No newline at end of file
+<result>25</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 8dda442ff2..40bd2e592a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>26</result>
\ No newline at end of file
+<result>27</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
index bee81f96e3..4c5729d4b1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_visits_converted>24</nb_visits_converted>
- <bounce_count>24</bounce_count>
+ <nb_uniq_visitors>27</nb_uniq_visitors>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
+ <nb_visits_converted>25</nb_visits_converted>
+ <bounce_count>25</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>92%</bounce_rate>
+ <bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>12</avg_time_on_site>
+ <avg_time_on_site>11</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 471c735b43..8830384805 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
<result date="2012-08">
<row>
<label>Piwik test</label>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_pageviews>25</nb_pageviews>
- <revenue>120</revenue>
- <nb_conversions>24</nb_conversions>
+ <nb_visits>27</nb_visits>
+ <nb_actions>30</nb_actions>
+ <nb_pageviews>26</nb_pageviews>
+ <revenue>125</revenue>
+ <nb_conversions>25</nb_conversions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
@@ -38,11 +38,11 @@
<nb_pageviews>10</nb_pageviews>
<revenue>5</revenue>
<nb_conversions>1</nb_conversions>
- <visits_evolution>-96.2%</visits_evolution>
- <actions_evolution>-65.5%</actions_evolution>
- <pageviews_evolution>-60%</pageviews_evolution>
- <revenue_evolution>-95.8%</revenue_evolution>
- <nb_conversions_evolution>-95.8%</nb_conversions_evolution>
+ <visits_evolution>-96.3%</visits_evolution>
+ <actions_evolution>-66.7%</actions_evolution>
+ <pageviews_evolution>-61.5%</pageviews_evolution>
+ <revenue_evolution>-96%</revenue_evolution>
+ <nb_conversions_evolution>-96%</nb_conversions_evolution>
<idsite>1</idsite>
</row>
<row>
diff --git a/tests/resources/access-logs/fake_logs_enable_all.log b/tests/resources/access-logs/fake_logs_enable_all.log
index 742eb003e6..24bafade73 100644
--- a/tests/resources/access-logs/fake_logs_enable_all.log
+++ b/tests/resources/access-logs/fake_logs_enable_all.log
@@ -2,7 +2,10 @@
175.41.192.41 - - [11/Aug/2012:18:10:38 +0200] "GET /blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" junk extra
175.41.192.41 - - [11/Aug/2012:18:11:30 +0200] "GET /this/is/not/the/page/i/am/looking/for/ HTTP/1.1" 404 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
72.44.32.11 - - [11/Aug/2012:19:48:07 +0200] "GET /to-an-error HTTP/1.1" 500 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0"
+
+# this is a bot request, it will be tracked when --enable-bots
72.44.32.11 - - [11/Aug/2012:19:48:08 +0200] "GET / HTTP/1.1" 200 3574 "-" "Googlebot/2.1 (+http://www.googlebot.com/bot.html)"
+
175.41.192.42 - - [11/Aug/2012:20:10:38 +0200] "GET /thing.js HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
175.41.192.42 - - [11/Aug/2012:20:11:39 +0200] "GET /thing.css HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
175.41.192.42 - - [11/Aug/2012:20:12:40 +0200] "GET /other.png HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
--
GitLab