aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-04-12 02:15:37 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-04-12 02:18:38 +0200
commit13ca1f55985b4e481876e78f84f8957aa94e21f3 (patch)
tree36dc0417bbe4c68cd32229860ccfd2aca7daecd0 /tests/functional
parent3436e3f1020cce0a7d78edb7517335dfa6645024 (diff)
downloadforums-13ca1f55985b4e481876e78f84f8957aa94e21f3.tar
forums-13ca1f55985b4e481876e78f84f8957aa94e21f3.tar.gz
forums-13ca1f55985b4e481876e78f84f8957aa94e21f3.tar.bz2
forums-13ca1f55985b4e481876e78f84f8957aa94e21f3.tar.xz
forums-13ca1f55985b4e481876e78f84f8957aa94e21f3.zip
[ticket/11491] Copy files back only if we saved them previously
PHPBB3-11491
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/extension_acp_test.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index cb908e0f98..1879cbd62c 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -92,13 +92,19 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
{
global $phpbb_root_path;
- // Copy back the board installed extensions from the temp directory
- self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
+ if (file_exists($phpbb_root_path . 'store/temp_ext/'))
+ {
+ // Copy back the board installed extensions from the temp directory
+ self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
+ }
// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
self::$helper->remove_files(self::$copied_files);
- self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
+ if (file_exists($phpbb_root_path . 'store/temp_ext/'))
+ {
+ self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
+ }
}
public function test_list()