Revert "fix tests"

This reverts commit d964ccba4008ca090c1c5b443aff196fc3ef947d.

diff --git a/ext/session/tests/bug32330.phpt b/ext/session/tests/bug32330.phpt
index 98d442ae5c9c50842d08ee4a4346cef56f989310..fe83cc950410c1d2fe73628383d536064d3639d2 100644 (file)
--- a/ext/session/tests/bug32330.phpt
+++ b/ext/session/tests/bug32330.phpt
@@ -69,17 +69,17 @@ $_SESSION['E'] = 'F';
 ?>
 --EXPECTF--
 open: path = /tmp, name = sid
-read: id = %s
 gc: maxlifetime = %d
+read: id = %s
 write: id = %s, data = A|s:1:"B";
 close
 open: path = /tmp, name = sid
-read: id = %s
 gc: maxlifetime = %d
+read: id = %s
 destroy: id = %s
 close
 open: path = /tmp, name = sid
-read: id = %s
 gc: maxlifetime = %d
+read: id = %s
 write: id = %s, data = E|s:1:"F";
 close

diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index a711fdea598b368a9154eb62fd9d3cae5e65ccba..67aa70c4af69a3324b12360aa9b3149f63f1179a 100644 (file)
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -52,9 +52,9 @@ ob_end_flush();
 *** Testing session_set_save_handler() : variation ***
 
 Open [%s,PHPSESSID]
-Read [%s,%s]
 GC [0]
 1 deleted
+Read [%s,%s]
 array(3) {
   ["Blah"]=>
   string(12) "Hello World!"
@@ -67,20 +67,12 @@ Write [%s,%s,Blah|s:12:"Hello World!";Foo|b:0;Guff|i:1234567890;]
 Close [%s,PHPSESSID]
 NULL
 Open [%s,PHPSESSID]
-Read [%s,%s]
 GC [0]
 1 deleted
-array(3) {
-  ["Blah"]=>
-  string(12) "Hello World!"
-  ["Foo"]=>
-  bool(false)
-  ["Guff"]=>
-  int(1234567890)
+Read [%s,%s]
+array(0) {
 }
 Destroy [%s,%s]
-
-Warning: unlink(%s): No such file or directory in %s on line %s
 Close [%s,PHPSESSID]
 bool(true)
 

diff --git a/ext/session/tests/session_set_save_handler_variation5.phpt b/ext/session/tests/session_set_save_handler_variation5.phpt
index 6ad600e4d182eb15c0ac3a5c5b1455acbd2cd215..4c1687cac6a77c23e1c1e37ba7b220250b49bed4 100644 (file)
--- a/ext/session/tests/session_set_save_handler_variation5.phpt
+++ b/ext/session/tests/session_set_save_handler_variation5.phpt
@@ -62,9 +62,9 @@ string(0) ""
 bool(true)
 Open [%s,PHPSESSID]
 CreateID [PHPT-%d]
-Read [%s,PHPT-%d]
 GC [0]
 1 deleted
+Read [%s,PHPT-%d]
 bool(true)
 string(%d) "PHPT-%d"
 Write [%s,PHPT-%d,]
@@ -76,9 +76,9 @@ string(%d) "PHPT-%d"
 bool(true)
 Open [%s,PHPSESSID]
 ValidateID [%s,PHPT-%d]
-Read [%s,PHPT-%d]
 GC [0]
 1 deleted
+Read [%s,PHPT-%d]
 bool(true)
 Write [%s,PHPT-%d,]
 Close [%s,PHPSESSID]
@@ -88,12 +88,10 @@ string(%d) "PHPT-%d"
 string(%d) "PHPT-%d"
 Open [%s,PHPSESSID]
 ValidateID [%s,PHPT-%d]
-Read [%s,PHPT-%d]
 GC [0]
 1 deleted
+Read [%s,PHPT-%d]
 bool(true)
 Destroy [%s,PHPT-%d]
-
-Warning: unlink(%s): No such file or directory in %s on line %d
 Close [%s,PHPSESSID]
 bool(true)