Fix session test failures as reported by Antony Dovgal.

These were caused by the tests assuming default values for some session
configuration settings, in particular session.save_path and session.name.
The tests now explicitly set these settings in the --INI-- section.

diff --git a/ext/session/tests/session_id_variation1.phpt b/ext/session/tests/session_id_variation1.phpt
index 8509f809ccaad31356da54ee36c8ae4f5693b973..54d980f3a7d85f1c70f17941ab987ab2abecadc9 100644 (file)
--- a/ext/session/tests/session_id_variation1.phpt
+++ b/ext/session/tests/session_id_variation1.phpt
@@ -35,12 +35,12 @@ ob_end_flush();
 string(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 string(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 Done
 

diff --git a/ext/session/tests/session_id_variation2.phpt b/ext/session/tests/session_id_variation2.phpt
index 568896b6ec94e7b6f4252d6eac7f7fb83e08e387..7b09adafc7f0a2747d2ba22638dda9c8b8eb5328 100644 (file)
--- a/ext/session/tests/session_id_variation2.phpt
+++ b/ext/session/tests/session_id_variation2.phpt
@@ -45,12 +45,12 @@ string(1) "0"
 string(1) "0"
 string(0) ""
 bool(true)
-string(32) "%s"
+string(%d) "%s"
 bool(true)
 string(1) "0"
 string(0) ""
 bool(true)
-string(40) "%s"
+string(%d) "%s"
 bool(true)
 bool(true)
 Done

diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index b554838f917846a0b79aa74005473745febb71d7..453645d314514f1a6356d39856270d4a98dab0bd 100644 (file)
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -8,6 +8,8 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --INI--
 open_basedir=.
 session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php
 

diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index 8599d4f14b088601aa0fcd0a37e86c6f7c67bdd8..4f1f988922864adaaff6be9f24322bf26c892391 100644 (file)
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -8,6 +8,8 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --INI--
 open_basedir=.
 session.save_handler=files
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php
 
@@ -25,6 +27,11 @@ $sessions = ($directory."/sessions");
 
 chdir($directory);
 
+// Delete the existing directory
+if (file_exists($sessions) === TRUE) {
+       @rmdir($sessions);
+}
+
 var_dump(mkdir($sessions));
 var_dump(chdir($sessions));
 ini_set("session.save_path", $directory);

diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index 053d4536692c8d626d9e442756d999aef097c808..3485f2373aa5feac448c34b39bce469a6021a6bf 100644 (file)
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -6,6 +6,8 @@ Test session_set_save_handler() function : variation
 session.gc_probability=1
 session.gc_divisor=1
 session.gc_maxlifetime=0
+session.save_path=
+session.name=PHPSESSID
 --FILE--
 <?php