diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-23 20:32:03 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-23 20:32:03 -0400 |
| commit | 1312e5b9650f9309142099ba2fe1a5738c43630e (patch) | |
| tree | 84e910d68f67ce019c41a06c452e3f1e3ae6adfe /tests/session | |
| parent | 6b671176ed530413aaddf1ccf83fd85a7bfd55d6 (diff) | |
| parent | df6ce22fa300a9721d20f0f0f770d0d721e43164 (diff) | |
| download | forums-1312e5b9650f9309142099ba2fe1a5738c43630e.tar forums-1312e5b9650f9309142099ba2fe1a5738c43630e.tar.gz forums-1312e5b9650f9309142099ba2fe1a5738c43630e.tar.bz2 forums-1312e5b9650f9309142099ba2fe1a5738c43630e.tar.xz forums-1312e5b9650f9309142099ba2fe1a5738c43630e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
Diffstat (limited to 'tests/session')
| -rw-r--r-- | tests/session/continue_test.php | 14 | ||||
| -rw-r--r-- | tests/session/fixtures/sessions_full.xml | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 3080121978..6737562a0a 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -19,21 +19,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case static public function session_begin_attempts() { + // The session_id field is defined as CHAR(32) in the database schema. + // Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes. + // Thus we fill those strings up with zeroes until they have a string length of 32. + return array( array( - 'bar_session', '4', 'user agent', '127.0.0.1', + 'bar_session000000000000000000000', '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' => 'anon_session00000000000000000000', 'session_user_id' => 1), + array('session_id' => 'bar_session000000000000000000000', '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.', ), array( - 'anon_session', '4', 'user agent', '127.0.0.1', + 'anon_session00000000000000000000', '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' => 'bar_session000000000000000000000', 'session_user_id' => 4), ), array( 'u' => array('1', null), diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml index 4559a08c55..bf6fc65997 100644 --- a/tests/session/fixtures/sessions_full.xml +++ b/tests/session/fixtures/sessions_full.xml @@ -22,13 +22,13 @@ <column>session_ip</column> <column>session_browser</column> <row> - <value>anon_session</value> + <value>anon_session00000000000000000000</value> <value>1</value> <value>127.0.0.1</value> <value>anonymous user agent</value> </row> <row> - <value>bar_session</value> + <value>bar_session000000000000000000000</value> <value>4</value> <value>127.0.0.1</value> <value>user agent</value> |