cvs: php4 /ext/session/tests 003.phpt 004.phpt 005.phpt 006.phpt

sas Thu Jan 10 00:11:20 2002 EDT Modified files: /php4/ext/session/tests 003.phpt 004.phpt 005.phpt 006.phpt Log: Make these tests succeed with non-standard settings Index: php4/ext/session/tests/003.phpt diff -u php4/ext/session/tests/003.phpt:1.3 php4/ext/session/tests/003.phpt:1.4 --- php4/ext/session/tests/003.phpt:1.3 Sat Oct 6 05:54:23 2001 +++ php4/ext/session/tests/003.phpt Thu Jan 10 00:11:19 2002 @@ -8,7 +8,7 @@ function method() { $this->yes++; } } -session_id("test"); +session_id("abtest"); session_start(); session_decode('baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'); Index: php4/ext/session/tests/004.phpt diff -u php4/ext/session/tests/004.phpt:1.4 php4/ext/session/tests/004.phpt:1.5 --- php4/ext/session/tests/004.phpt:1.4 Sat Oct 6 05:54:23 2001 +++ php4/ext/session/tests/004.phpt Thu Jan 10 00:11:19 2002 @@ -8,7 +8,7 @@ var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'; function open($save_path, $session_name) { - print "OPEN: $save_path, $session_name\n"; + print "OPEN: $session_name\n"; return true; } function close() @@ -48,7 +48,7 @@ session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, "read"), array($hnd, "write"), array($hnd, "destroy"), array($hnd, "gc")); -session_id("test"); +session_id("abtest"); session_start(); $baz->method(); $arr[3]->method(); @@ -67,8 +67,8 @@ session_destroy(); ?> --EXPECT-- -OPEN: /tmp, PHPSESSID -READ: test +OPEN: PHPSESSID +READ: abtest object(foo)(2) { ["bar"]=> string(2) "ok" @@ -84,9 +84,9 @@ int(2) } } -WRITE: test, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}} -OPEN: /tmp, PHPSESSID -READ: test +WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}} +OPEN: PHPSESSID +READ: abtest object(foo)(2) { ["bar"]=> string(2) "ok" @@ -102,4 +102,4 @@ int(2) } } -DESTROY: test +DESTROY: abtest Index: php4/ext/session/tests/005.phpt diff -u php4/ext/session/tests/005.phpt:1.2 php4/ext/session/tests/005.phpt:1.3 --- php4/ext/session/tests/005.phpt:1.2 Sun Jul 22 17:46:39 2001 +++ php4/ext/session/tests/005.phpt Thu Jan 10 00:11:19 2002 @@ -9,7 +9,7 @@ var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'; function open($save_path, $session_name) { - print "OPEN: $save_path, $session_name\n"; + print "OPEN: $session_name\n"; return true; } function close() @@ -50,7 +50,7 @@ session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, "read"), array($hnd, "write"), array($hnd, "destroy"), array($hnd, "gc")); -session_id("test"); +session_id("abtest"); session_start(); $baz->method(); $arr[3]->method(); @@ -79,8 +79,8 @@ session_destroy(); ?> --EXPECT-- -OPEN: /tmp, PHPSESSID -READ: test +OPEN: PHPSESSID +READ: abtest object(foo)(2) { ["bar"]=> string(2) "ok" @@ -96,10 +96,10 @@ int(2) } } -WRITE: test, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}} +WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}} CLOSE -OPEN: /tmp, PHPSESSID -READ: test +OPEN: PHPSESSID +READ: abtest object(foo)(2) { ["bar"]=> string(2) "ok" @@ -116,10 +116,10 @@ } } int(123) -WRITE: test, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}}c|i:123; +WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}}c|i:123; CLOSE -OPEN: /tmp, PHPSESSID -READ: test +OPEN: PHPSESSID +READ: abtest object(foo)(2) { ["bar"]=> string(2) "ok" @@ -136,5 +136,5 @@ } } int(123) -DESTROY: test +DESTROY: abtest CLOSE Index: php4/ext/session/tests/006.phpt diff -u php4/ext/session/tests/006.phpt:1.2 php4/ext/session/tests/006.phpt:1.3 --- php4/ext/session/tests/006.phpt:1.2 Sun Jul 22 17:46:39 2001 +++ php4/ext/session/tests/006.phpt Thu Jan 10 00:11:19 2002 @@ -4,7 +4,7 @@ <?php error_reporting(E_ALL & ~E_NOTICE); ob_start(); -session_id("test"); +session_id("abtest"); session_start(); class a {