diff options
| author | Ant Phillips <ant@php.net> | 2008-04-30 15:20:16 +0000 |
|---|---|---|
| committer | Ant Phillips <ant@php.net> | 2008-04-30 15:20:16 +0000 |
| commit | ab211d72a37a385a7fa8575db9a81f528d983a9d (patch) | |
| tree | 940ec01d69f5e334a637f941776592eb4e485ecd /ext/session | |
| parent | 3946b4727b1215a661522323f58fb163c630153b (diff) | |
| download | php-git-ab211d72a37a385a7fa8575db9a81f528d983a9d.tar.gz | |
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.
Diffstat (limited to 'ext/session')
5 files changed, 15 insertions, 4 deletions
diff --git a/ext/session/tests/session_id_variation1.phpt b/ext/session/tests/session_id_variation1.phpt index 8509f809cc..54d980f3a7 100644 --- 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 568896b6ec..7b09adafc7 100644 --- 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 b554838f91..453645d314 100644 --- 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 8599d4f14b..4f1f988922 100644 --- 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 053d453669..3485f2373a 100644 --- 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 |