From 95e6ded1b26c14b1ef55699b171ce422827364b1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 9 Feb 2014 10:08:48 +0100
Subject: more robust HTTP testing

connections are now retried after timeout and failing connections will
be marked as skipped instead of failing. This should reduce false alarms
on travis
---
 _test/tests/inc/httpclient_http_proxy.test.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '_test/tests/inc/httpclient_http_proxy.test.php')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index 4aa039fcc..61228ad94 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once (__DIR__ . '/httpclient_mock.php');
+
 class httpclient_http_proxy_test extends DokuWikiTest {
     protected $url = 'http://test.dokuwiki.org/README';
 
@@ -7,7 +9,7 @@ class httpclient_http_proxy_test extends DokuWikiTest {
      * @group internet
      */
     function test_simpleget(){
-        $http = new HTTPClient();
+        $http = new HTTPMockClient();
         // proxy provided by  Andrwe Lord Weber <dokuwiki@andrwe.org>
         $http->proxy_host = 'proxy.andrwe.org';
         $http->proxy_port = 8080;
-- 
cgit v1.2.3


From 2bbe40cf8802bbc3bbf83d454cc294080ebaf241 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 11 Feb 2014 23:01:29 +0100
Subject: HTTPClient: correctly abort a proxy connection

if a needed CONNECT tunnel fails
---
 _test/tests/inc/httpclient_http_proxy.test.php | 1 -
 1 file changed, 1 deletion(-)

(limited to '_test/tests/inc/httpclient_http_proxy.test.php')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index 61228ad94..c44dc7ed7 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -18,5 +18,4 @@ class httpclient_http_proxy_test extends DokuWikiTest {
         $this->assertFalse($data === false, 'HTTP response '.$http->error);
         $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content');
     }
-
 }
\ No newline at end of file
-- 
cgit v1.2.3