Fixes #6174

Improves Log_test::test_configuration() test

2 files changed, 5 insertions, 3 deletions

diff --git a/tests/codeigniter/core/Log_test.php b/tests/codeigniter/core/Log_test.php
index 3715949f6..fc3e11e1f 100644
--- a/tests/codeigniter/core/Log_test.php
+++ b/tests/codeigniter/core/Log_test.php
@@ -16,14 +16,14 @@ class Log_test extends CI_TestCase {
 		$enabled    = new ReflectionProperty('CI_Log', '_enabled');
 		$enabled->setAccessible(TRUE);
 
-		$this->ci_set_config('log_path', '/root/');
+		$this->ci_set_config('log_path', $this->ci_readonly_dir->url());
 		$this->ci_set_config('log_threshold', 'z');
 		$this->ci_set_config('log_date_format', 'd.m.Y');
 		$this->ci_set_config('log_filename', '');
 		$this->ci_set_config('log_file_permissions', '');
 		$instance = new CI_Log();
 
-		$this->assertEquals($path->getValue($instance), '/root/');
+		$this->assertNotFalse(strpos($path->getValue($instance), 'application/readonly'));
 		$this->assertEquals($threshold->getValue($instance), 1);
 		$this->assertEquals($date_fmt->getValue($instance), 'd.m.Y');
 		$this->assertEquals($filename->getValue($instance), 'log-'.date('Y-m-d').'.php');
@@ -37,7 +37,7 @@ class Log_test extends CI_TestCase {
 		$this->ci_set_config('log_file_permissions', 0600);
 		$instance = new CI_Log();
 
-		$this->assertEquals($path->getValue($instance), APPPATH.'logs/');
+		$this->assertEquals($path->getValue($instance), $this->ci_vfs_root->url().'application/logs'.DIRECTORY_SEPARATOR);
 		$this->assertEquals($threshold->getValue($instance), 0);
 		$this->assertEquals($date_fmt->getValue($instance), 'Y-m-d H:i:s');
 		$this->assertEquals($filename->getValue($instance), 'testname.log');
diff --git a/tests/mocks/ci_testcase.php b/tests/mocks/ci_testcase.php
index de46f6df6..3ebb6b822 100644
--- a/tests/mocks/ci_testcase.php
+++ b/tests/mocks/ci_testcase.php
@@ -5,6 +5,7 @@ class CI_TestCase extends \PHPUnit\Framework\TestCase {
 	public $ci_vfs_root;
 	public $ci_app_root;
 	public $ci_base_root;
+	public $ci_readonly_dir;
 	protected $ci_instance;
 	protected static $ci_test_instance;
 
@@ -39,6 +40,7 @@ class CI_TestCase extends \PHPUnit\Framework\TestCase {
 		$this->ci_app_root = vfsStream::newDirectory('application')->at($this->ci_vfs_root);
 		$this->ci_base_root = vfsStream::newDirectory('system')->at($this->ci_vfs_root);
 		$this->ci_view_root = vfsStream::newDirectory('views')->at($this->ci_app_root);
+		$this->ci_readonly_dir = vfsStream::newDirectory('readonly', 555)->at($this->ci_app_root);
 
 		if (method_exists($this, 'set_up'))
 		{