aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_functional_test_case.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-08 21:15:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-08 21:17:38 +0100
commitdaf668a9693a65d66d57ccbe1bb365b163610c40 (patch)
tree1e6618688d80bf43a487506f9ddf4def206cb743 /tests/test_framework/phpbb_functional_test_case.php
parentf26cf2dc1f2c58ac6cf97974aafa749688cacbaa (diff)
downloadforums-daf668a9693a65d66d57ccbe1bb365b163610c40.tar
forums-daf668a9693a65d66d57ccbe1bb365b163610c40.tar.gz
forums-daf668a9693a65d66d57ccbe1bb365b163610c40.tar.bz2
forums-daf668a9693a65d66d57ccbe1bb365b163610c40.tar.xz
forums-daf668a9693a65d66d57ccbe1bb365b163610c40.zip
[ticket/15055] Display content on unexpted server error
PHPBB3-15055
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 2be16c7198..a63d5dc5ec 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -911,10 +911,15 @@ class phpbb_functional_test_case extends phpbb_test_case
* status code. This assertion tries to catch that.
*
* @param int $status_code Expected status code
- * @return null
+ * @return void
*/
static public function assert_response_status_code($status_code = 200)
{
+ if ($status_code != self::$client->getResponse()->getStatus() &&
+ preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatus()))
+ {
+ self::fail('Encountered unexpected server error:\n' . self::$client->getResponse()->getContent());
+ }
self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match');
}