Merge branch 'ticket/17296' into ticket/17296-master

PHPBB3-17296

tests/functional/session_page_update_test.php

@@ -25,6 +25,10 @@ class phpbb_functional_session_page_update_test extends phpbb_functional_test_ca
 
 		$db = $this->db;
 
+		// Delete previous session info for admin user
+		$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2';
+		$db->sql_query($sql);
+
 		$this->login();
 	}
 
@@ -32,9 +36,6 @@ class phpbb_functional_session_page_update_test extends phpbb_functional_test_ca
 	{
 		$db = $this->get_db();
 
-		// Sleep for 2 seconds to ensure we don't have session time race condition
-		sleep(2);
-
 		// Request index page
 		self::request('GET', 'index.php');
 		$this->assertEquals(200, self::$client->getInternalResponse()->getStatusCode(), 'Failed asserting that status of index page is 200');