Make these tests succeed with non-standard settings

diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 3e2a5d33957f66abba65392558e97433c9ff815e..ad25e5692db04ec993394c1f535b6970ae75f03e 100644 (file)
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -8,7 +8,7 @@ class foo {
        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;}}');
 

diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index 52b3a248d49ff65c5b97da69527a9fe9df7df90c..54ac427761fc664fca215a225f2b947f694e8ce1 100644 (file)
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -8,7 +8,7 @@ class handler {
        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 @@ ob_start();
 
 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 @@ var_dump($arr);
 session_destroy();
 ?>
 --EXPECT--
-OPEN: /tmp, PHPSESSID
-READ: test
+OPEN: PHPSESSID
+READ: abtest
 object(foo)(2) {
   ["bar"]=>
   string(2) "ok"
@@ -84,9 +84,9 @@ array(1) {
     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 @@ array(1) {
     int(2)
   }
 }
-DESTROY: test
+DESTROY: abtest

diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 34b0e39842a9efc51aa53650674101d60d1c094a..14bb6c25ea44c82ef1f740e9a6e76cc303ccfbd1 100644 (file)
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -9,7 +9,7 @@ class handler {
        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 @@ ob_start();
 
 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 @@ var_dump($baz); var_dump($arr); var_dump($c);
 session_destroy();
 ?>
 --EXPECT--
-OPEN: /tmp, PHPSESSID
-READ: test
+OPEN: PHPSESSID
+READ: abtest
 object(foo)(2) {
   ["bar"]=>
   string(2) "ok"
@@ -96,10 +96,10 @@ array(1) {
     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 @@ array(1) {
   }
 }
 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 @@ array(1) {
   }
 }
 int(123)
-DESTROY: test
+DESTROY: abtest
 CLOSE

diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 649e42c85872235ec646a6979b1b45c09a59e3f7..f7d4c9891def544b14ca2e18b458de01219102c3 100644 (file)
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -4,7 +4,7 @@ References between variables in sessions
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 ob_start();
-session_id("test");
+session_id("abtest");
 session_start();
 
 class a {