summaryrefslogtreecommitdiff
path: root/_test/tests/inc/mailer.test.php
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-03-10 23:57:01 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-03-10 23:57:01 +0100
commitf97db66038968542deefbf9817a3dd49b67b1904 (patch)
tree6995f5bfd7017999a743c327474afc7b9514d94f /_test/tests/inc/mailer.test.php
parent6384941886832589f7bb3c13bc18115499cf9369 (diff)
parent9f12fc1cc9e916c3172a0cf8953ed70fd18f2ec1 (diff)
downloadrpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.gz
rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.bz2
Merge remote-tracking branch 'origin/master' into userlink
Conflicts: inc/parser/renderer.php inc/template.php
Diffstat (limited to '_test/tests/inc/mailer.test.php')
-rw-r--r--_test/tests/inc/mailer.test.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index 4541d9906..50d282864 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -191,7 +191,10 @@ class mailer_test extends DokuWikiTest {
// ask message lint if it is okay
$html = new HTTPClient();
$results = $html->post('http://tools.ietf.org/tools/msglint/msglint', array('msg'=>$msg));
- $this->assertTrue($results !== false);
+ if($results === false) {
+ $this->markTestSkipped('no response from validator');
+ return;
+ }
// parse the result lines
$lines = explode("\n", $results);