Use message from test helper when assertion fails

This commit is contained in:
Zach Borboa
2021-03-16 21:57:12 -04:00
parent 1ef5fce3df
commit 7697d2be2b
2 changed files with 17 additions and 15 deletions
+12
View File
@@ -9,6 +9,8 @@ class Test
const TEST_URL = 'http://127.0.0.1:8000/';
const ERROR_URL = 'http://1.2.3.4/';
public $message;
private $testUrl;
public function __construct($port = null)
@@ -30,6 +32,16 @@ class Test
} else {
$this->curl->$request_method($this->testUrl);
}
$this->message =
'error message: ' . $this->curl->errorMessage . "\n" .
'curl error message: ' . $this->curl->curlErrorMessage . "\n" .
'http error message: ' . $this->curl->httpErrorMessage . "\n" .
'error code: ' . $this->curl->errorCode . "\n" .
'curl error code: ' . $this->curl->curlErrorCode . "\n" .
'raw response: ' . $this->curl->rawResponse . "\n" .
'';
return $this->curl->response;
}
+5 -15
View File
@@ -1161,26 +1161,16 @@ class CurlTest extends \PHPUnit\Framework\TestCase
public function testTimeout()
{
$test = new Test('8003');
$test->curl->verbose();
$test->curl->setTimeout(10);
$test->server('timeout_legacy', 'GET', array(
'seconds' => '5',
));
$message =
'error message: ' . $test->curl->errorMessage . "\n" .
'curl error message: ' . $test->curl->curlErrorMessage . "\n" .
'http error message: ' . $test->curl->httpErrorMessage . "\n" .
'error code: ' . $test->curl->errorCode . "\n" .
'curl error code: ' . $test->curl->curlErrorCode . "\n" .
'raw response: ' . $test->curl->rawResponse . "\n" .
'';
$this->assertFalse($test->curl->error, $message);
$this->assertFalse($test->curl->curlError, $message);
$this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode, $message);
$this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode, $message);
$this->assertFalse($test->curl->httpError, $message);
$this->assertFalse($test->curl->error, $test->message);
$this->assertFalse($test->curl->curlError, $test->message);
$this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode, $test->message);
$this->assertNotEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode, $test->message);
$this->assertFalse($test->curl->httpError, $test->message);
}
public function testError()