aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_functional_test_case.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-30 19:03:20 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-30 19:03:20 +0200
commit17681c0770e3a3fb7a4b0ef74e4038c6de787119 (patch)
treef308b4b50b33ce28a52a094d549e5895bfbd0089 /tests/test_framework/phpbb_functional_test_case.php
parent7fd1a166da4c040532bb8ff35584b330348366d2 (diff)
parentcb007acc7671b6594d1f54c5279e33bacce66095 (diff)
downloadforums-17681c0770e3a3fb7a4b0ef74e4038c6de787119.tar
forums-17681c0770e3a3fb7a4b0ef74e4038c6de787119.tar.gz
forums-17681c0770e3a3fb7a4b0ef74e4038c6de787119.tar.bz2
forums-17681c0770e3a3fb7a4b0ef74e4038c6de787119.tar.xz
forums-17681c0770e3a3fb7a4b0ef74e4038c6de787119.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11034] Re-arranged install order to emulate real install
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index c042d75811..b953017d0a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -197,13 +197,11 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->do_request('create_table', $data);
- file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true));
-
$this->do_request('config_file', $data);
-
- copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
+ file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true));
$this->do_request('final', $data);
+ copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
}
private function do_request($sub, $post_data = null)