Update system tests showing we don't process downloads/outlinks as entry/exit action.

Transition API now returns more "loops" for the page view's transition

1 files changed, 92 insertions, 76 deletions

diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
index 937d7d2f86..09d4c5e5ea 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
@@ -10,79 +10,95 @@ try 'php archive.php --url=http://your.piwik/path'
 -------------------------------------------------------
 
 
-INFO [2015-08-20 13:41:26] ---------------------------
-INFO [2015-08-20 13:41:26] INIT
-INFO [2015-08-20 13:41:26] Running Piwik 3.0.0-b1 as Super User
-INFO [2015-08-20 13:41:26] ---------------------------
-INFO [2015-08-20 13:41:26] NOTES
-INFO [2015-08-20 13:41:26] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
-INFO [2015-08-20 13:41:26]   See the doc at: http://piwik.org/docs/setup-auto-archiving/
-INFO [2015-08-20 13:41:26] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
-INFO [2015-08-20 13:41:26] - Reports for the current week/month/year will be refreshed at most every 3600 seconds.
-INFO [2015-08-20 13:41:26] Will invalidate archived reports for 2012-08-09 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-10 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-11 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-15 for following siteIds: 1,2
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-09-30 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2014-03-12 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2014-03-13 for following siteIds: 1
-INFO [2015-08-20 13:41:27] - Will process 0 websites with new visits since 7 days 0 hours
-INFO [2015-08-20 13:41:27] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2
-INFO [2015-08-20 13:41:27] ---------------------------
-INFO [2015-08-20 13:41:27] START
-INFO [2015-08-20 13:41:27] Starting Piwik reports archiving...
-INFO [2015-08-20 13:41:27] Will pre-process for website id = 1, period = day, date = last52
-INFO [2015-08-20 13:41:27] - pre-processing all visits
-INFO [2015-08-20 13:41:29] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:41:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:31] Archived website id = 1, period = day, 3 segments, 0 visits in last last52 days, 0 visits today, Time elapsed: 2.207s
-INFO [2015-08-20 13:41:31] Will pre-process for website id = 1, period = week, date = last260
-INFO [2015-08-20 13:41:31] - pre-processing all visits
-INFO [2015-08-20 13:41:31] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:41:31] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:56] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:18] Archived website id = 1, period = week, 3 segments, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 47.002s
-INFO [2015-08-20 13:42:18] Will pre-process for website id = 1, period = month, date = last52
-INFO [2015-08-20 13:42:18] - pre-processing all visits
-INFO [2015-08-20 13:42:18] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:42:18] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:24] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:29] Archived website id = 1, period = month, 3 segments, 40 visits in last last52 months, 0 visits this month, Time elapsed: 11.370s
-INFO [2015-08-20 13:42:29] Will pre-process for website id = 1, period = year, date = last7
-INFO [2015-08-20 13:42:29] - pre-processing all visits
-INFO [2015-08-20 13:42:29] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:42:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:32] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:34] Archived website id = 1, period = year, 3 segments, 40 visits in last last7 years, 0 visits this year, Time elapsed: 4.820s
-INFO [2015-08-20 13:42:34] Archived website id = 1, 16 API requests, Time elapsed: 67.301s [1/2 done]
-INFO [2015-08-20 13:42:34] Will pre-process for website id = 2, period = day, date = last52
-INFO [2015-08-20 13:42:34] - pre-processing all visits
-INFO [2015-08-20 13:42:36] Archived website id = 2, period = day, 0 segments, 0 visits in last last52 days, 0 visits today, Time elapsed: 0.001s
-INFO [2015-08-20 13:42:36] Will pre-process for website id = 2, period = week, date = last260
-INFO [2015-08-20 13:42:36] - pre-processing all visits
-INFO [2015-08-20 13:42:51] Archived website id = 2, period = week, 0 segments, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 15.229s
-INFO [2015-08-20 13:42:51] Will pre-process for website id = 2, period = month, date = last52
-INFO [2015-08-20 13:42:51] - pre-processing all visits
-INFO [2015-08-20 13:42:55] Archived website id = 2, period = month, 0 segments, 1 visits in last last52 months, 0 visits this month, Time elapsed: 3.790s
-INFO [2015-08-20 13:42:55] Will pre-process for website id = 2, period = year, date = last7
-INFO [2015-08-20 13:42:55] - pre-processing all visits
-INFO [2015-08-20 13:42:56] Archived website id = 2, period = year, 0 segments, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.380s
-INFO [2015-08-20 13:42:56] Archived website id = 2, 4 API requests, Time elapsed: 22.132s [2/2 done]
-INFO [2015-08-20 13:42:56] Done archiving!
-INFO [2015-08-20 13:42:56] ---------------------------
-INFO [2015-08-20 13:42:56] SUMMARY
-INFO [2015-08-20 13:42:56] Total visits for today across archived websites: 0
-INFO [2015-08-20 13:42:56] Archived today's reports for 2 websites
-INFO [2015-08-20 13:42:56] Archived week/month/year for 2 websites
-INFO [2015-08-20 13:42:56] Skipped 0 websites: no new visit since the last script execution
-INFO [2015-08-20 13:42:56] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old
-INFO [2015-08-20 13:42:56] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old
-INFO [2015-08-20 13:42:56] Total API requests: 20
-INFO [2015-08-20 13:42:56] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 20 req, 89599 ms, no error
-INFO [2015-08-20 13:42:56] Time elapsed: 89.600s
-INFO [2015-08-20 13:42:56] ---------------------------
-INFO [2015-08-20 13:42:56] SCHEDULED TASKS
-INFO [2015-08-20 13:42:56] Starting Scheduled tasks...
-INFO [2015-08-20 13:42:56] done
-INFO [2015-08-20 13:42:56] ---------------------------
\ No newline at end of file
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] INIT
+INFO [2016-11-15 01:01:32] Running Piwik 3.0.0-b2 as Super User
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] NOTES
+INFO [2016-11-15 01:01:32] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
+INFO [2016-11-15 01:01:32]   See the doc at: http://piwik.org/docs/setup-auto-archiving/
+INFO [2016-11-15 01:01:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
+INFO [2016-11-15 01:01:32] - Reports for the current week/month/year will be refreshed at most every 3600 seconds.
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
+INFO [2016-11-15 01:01:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] START
+INFO [2016-11-15 01:01:32] Starting Piwik reports archiving...
+INFO [2016-11-15 01:01:32] Old report was invalidated for website id 1
+INFO [2016-11-15 01:01:32] Will pre-process for website id = 1, period = day, date = last52
+INFO [2016-11-15 01:01:32] - pre-processing all visits
+INFO [2016-11-15 01:01:34] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:01:34] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:01:34] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:01:37] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.036s
+INFO [2016-11-15 01:01:37] Will pre-process for website id = 1, period = week, date = last260
+INFO [2016-11-15 01:01:37] - pre-processing all visits
+INFO [2016-11-15 01:01:37] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:01:37] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:02:33] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 84.465s
+INFO [2016-11-15 01:03:02] Will pre-process for website id = 1, period = month, date = last52
+INFO [2016-11-15 01:03:02] - pre-processing all visits
+INFO [2016-11-15 01:03:02] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:03:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:19] Archived website id = 1, period = month, 3 segments, 41 visits in last 52 months, 0 visits this month, Time elapsed: 17.197s
+INFO [2016-11-15 01:03:19] Will pre-process for website id = 1, period = year, date = last7
+INFO [2016-11-15 01:03:19] - pre-processing all visits
+INFO [2016-11-15 01:03:19] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:03:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:25] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 6.455s
+INFO [2016-11-15 01:03:25] Archived website id = 1, 16 API requests, Time elapsed: 113.161s [1/3 done]
+INFO [2016-11-15 01:03:25] Old report was invalidated for website id 2
+INFO [2016-11-15 01:03:25] Will pre-process for website id = 2, period = day, date = last52
+INFO [2016-11-15 01:03:25] - pre-processing all visits
+INFO [2016-11-15 01:03:27] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.523s
+INFO [2016-11-15 01:03:27] Will pre-process for website id = 2, period = week, date = last260
+INFO [2016-11-15 01:03:27] - pre-processing all visits
+INFO [2016-11-15 01:03:47] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 19.715s
+INFO [2016-11-15 01:03:47] Will pre-process for website id = 2, period = month, date = last52
+INFO [2016-11-15 01:03:47] - pre-processing all visits
+INFO [2016-11-15 01:03:50] Archived website id = 2, period = month, 0 segments, 1 visits in last 52 months, 0 visits this month, Time elapsed: 3.855s
+INFO [2016-11-15 01:03:50] Will pre-process for website id = 2, period = year, date = last7
+INFO [2016-11-15 01:03:50] - pre-processing all visits
+INFO [2016-11-15 01:03:51] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.058s
+INFO [2016-11-15 01:03:51] Archived website id = 2, 4 API requests, Time elapsed: 26.156s [2/3 done]
+INFO [2016-11-15 01:03:52] Old report was invalidated for website id 3
+INFO [2016-11-15 01:03:52] Will pre-process for website id = 3, period = day, date = last52
+INFO [2016-11-15 01:03:52] - pre-processing all visits
+INFO [2016-11-15 01:03:53] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.536s
+INFO [2016-11-15 01:03:53] Will pre-process for website id = 3, period = week, date = last260
+INFO [2016-11-15 01:03:53] - pre-processing all visits
+INFO [2016-11-15 01:04:14] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.828s
+INFO [2016-11-15 01:04:14] Will pre-process for website id = 3, period = month, date = last52
+INFO [2016-11-15 01:04:14] - pre-processing all visits
+INFO [2016-11-15 01:04:18] Archived website id = 3, period = month, 0 segments, 15 visits in last 52 months, 0 visits this month, Time elapsed: 4.449s
+INFO [2016-11-15 01:04:18] Will pre-process for website id = 3, period = year, date = last7
+INFO [2016-11-15 01:04:18] - pre-processing all visits
+INFO [2016-11-15 01:04:20] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 1.866s
+INFO [2016-11-15 01:04:20] Archived website id = 3, 4 API requests, Time elapsed: 28.684s [3/3 done]
+INFO [2016-11-15 01:04:20] Done archiving!
+INFO [2016-11-15 01:04:20] ---------------------------
+INFO [2016-11-15 01:04:20] SUMMARY
+INFO [2016-11-15 01:04:20] Total visits for today across archived websites: 0
+INFO [2016-11-15 01:04:20] Archived today's reports for 3 websites
+INFO [2016-11-15 01:04:20] Archived week/month/year for 3 websites
+INFO [2016-11-15 01:04:20] Skipped 0 websites
+INFO [2016-11-15 01:04:20] - 0 skipped because no new visit since the last script execution
+INFO [2016-11-15 01:04:20] - 0 skipped because existing daily reports are less than 150 seconds old
+INFO [2016-11-15 01:04:20] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
+INFO [2016-11-15 01:04:20] Total API requests: 24
+INFO [2016-11-15 01:04:20] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 168167 ms, no error
+INFO [2016-11-15 01:04:20] Time elapsed: 168.167s
+INFO [2016-11-15 01:04:20] ---------------------------
+INFO [2016-11-15 01:04:20] SCHEDULED TASKS
+INFO [2016-11-15 01:04:20] Starting Scheduled tasks...
+INFO [2016-11-15 01:04:20] done
+INFO [2016-11-15 01:04:20] ---------------------------
\ No newline at end of file