aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-09-05 09:20:06 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-09-05 09:20:06 +0200
commitbbb10f576f38d7aef8f2607b87b59954b1fc897c (patch)
treee1bfc4ceb642b838e3566124864ce820bdfbb0f6 /tests/template
parent3048fcf4b811d471b26acdc790bdac18b8e9500e (diff)
parent4e2437a6c12cdaecfd4e7eb59659fc6fbecbe438 (diff)
downloadforums-bbb10f576f38d7aef8f2607b87b59954b1fc897c.tar
forums-bbb10f576f38d7aef8f2607b87b59954b1fc897c.tar.gz
forums-bbb10f576f38d7aef8f2607b87b59954b1fc897c.tar.bz2
forums-bbb10f576f38d7aef8f2607b87b59954b1fc897c.tar.xz
forums-bbb10f576f38d7aef8f2607b87b59954b1fc897c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10354] Include cache directory path in unwritable message. Conflicts: tests/template/template_test.php
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/template_test_case.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 7cf995f194..0e1f960f61 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -66,9 +66,10 @@ class phpbb_template_template_test_case extends phpbb_test_case
// Test the engine can be used
$this->setup_engine();
- if (!is_writable(dirname($this->template->cachepath)))
+ $template_cache_dir = dirname($this->template->cachepath);
+ if (!is_writable($template_cache_dir))
{
- $this->markTestSkipped("Template cache directory is not writable.");
+ $this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
}
foreach (glob($this->template->cachepath . '*') as $file)