Merge branch 'develop-olympus' into develop

* develop-olympus:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.

Conflicts:
	tests/mock/cache.php

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index dd29e0e9e3..713f1ca817 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -90,4 +90,9 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	public function sql_freeresult($query_id)
 	{
 	}
+
+	public function obtain_bots()
+	{
+		return isset($this->data['_bots']) ? $this->data['_bots'] : array();
+	}
 }