aboutsummaryrefslogtreecommitdiffstats
path: root/tests/session
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-02-27 22:20:36 +0100
committerNils Adermann <naderman@naderman.de>2011-02-27 22:20:36 +0100
commit921603b09e1e34059f783c502d5dfc9ae0189057 (patch)
tree8fb5deae52d8a65d0e7bf954ef933bb4bb0ffbea /tests/session
parent7255ef4f6d9ea8c63036ad32fa376cd03b1b8e9b (diff)
downloadforums-921603b09e1e34059f783c502d5dfc9ae0189057.tar
forums-921603b09e1e34059f783c502d5dfc9ae0189057.tar.gz
forums-921603b09e1e34059f783c502d5dfc9ae0189057.tar.bz2
forums-921603b09e1e34059f783c502d5dfc9ae0189057.tar.xz
forums-921603b09e1e34059f783c502d5dfc9ae0189057.zip
[task/session-tests] Make result check independent of returned row order.
PHPBB3-9732
Diffstat (limited to 'tests/session')
-rw-r--r--tests/session/continue_test.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 27ac457c2d..3080121978 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -24,7 +24,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
'bar_session', '4', 'user agent', '127.0.0.1',
array(
array('session_id' => 'anon_session', 'session_user_id' => 1),
- array('session_id' => 'bar_session', 'session_user_id' => 4)
+ array('session_id' => 'bar_session', 'session_user_id' => 4),
),
array(),
'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
@@ -32,8 +32,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
array(
'anon_session', '4', 'user agent', '127.0.0.1',
array(
+ array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
array('session_id' => 'bar_session', 'session_user_id' => 4),
- array('session_id' => '__new_session_id__', 'session_user_id' => 1) // use generated SID
),
array(
'u' => array('1', null),
@@ -70,7 +70,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
$session->session_begin();
$sql = 'SELECT session_id, session_user_id
- FROM phpbb_sessions';
+ FROM phpbb_sessions
+ ORDER BY session_user_id';
$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);