aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-30 19:00:17 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-30 19:00:17 +0200
commitcb007acc7671b6594d1f54c5279e33bacce66095 (patch)
tree8ea5f3009b060b89eb12f6944f8a580013f495ac
parent49a53755e6da8a8dc5ff09ba1768c9069a00ef52 (diff)
parent647d395908a6e852acef9ec65aa649eb3754a1d2 (diff)
downloadforums-cb007acc7671b6594d1f54c5279e33bacce66095.tar
forums-cb007acc7671b6594d1f54c5279e33bacce66095.tar.gz
forums-cb007acc7671b6594d1f54c5279e33bacce66095.tar.bz2
forums-cb007acc7671b6594d1f54c5279e33bacce66095.tar.xz
forums-cb007acc7671b6594d1f54c5279e33bacce66095.zip
Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympus
* Fyorl/ticket/11034: [ticket/11034] Re-arranged install order to emulate real install
-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 ed8ce9d040..2423299b7c 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -139,13 +139,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)