aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-05-26 21:16:49 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-05-27 23:10:06 +0200
commita3e5efc63483f06c6d66296adbd0538d59a05a21 (patch)
tree5f7a6704ae7b7a4cd6c6a8155b81acfdb5692b07 /tests/test_framework
parent5dcf028cf0791956be0a8cb5f8ea82d3cd91080a (diff)
downloadforums-a3e5efc63483f06c6d66296adbd0538d59a05a21.tar
forums-a3e5efc63483f06c6d66296adbd0538d59a05a21.tar.gz
forums-a3e5efc63483f06c6d66296adbd0538d59a05a21.tar.bz2
forums-a3e5efc63483f06c6d66296adbd0538d59a05a21.tar.xz
forums-a3e5efc63483f06c6d66296adbd0538d59a05a21.zip
[ticket/11568] Set client manually so we can increase the cURL timeout
PHPBB3-11568
Diffstat (limited to 'tests/test_framework')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index cd3133f3a0..b622c6e284 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -158,6 +158,13 @@ class phpbb_functional_test_case extends phpbb_test_case
$cookieJar = new CookieJar;
self::$static_client = new Goutte\Client(array(), null, $cookieJar);
+ // Set client manually so we can increase the cURL timeout
+ self::$static_client->setClient(new Guzzle\Http\Client('', array(
+ Guzzle\Http\Client::DISABLE_REDIRECTS => true,
+ 'curl.options' => array(
+ CURLOPT_TIMEOUT => 120
+ ),
+ )));
// Reset the curl handle because it is 0 at this point and not a valid
// resource