Unify error messages for Executor to always include original query name

Author: clue

composer.json

@@ -13,6 +13,7 @@
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
     },
     "require-dev": {
+        "clue/block-react": "^1.2",
         "phpunit/phpunit": "^5.0 || ^4.8.10"
     },
     "autoload": {

src/Query/Executor.php

@@ -59,7 +59,7 @@ public function doQuery($nameserver, $transport, $queryData, $name)
         // we only support UDP right now
         if ($transport !== 'udp') {
             return Promise\reject(new \RuntimeException(
-                'Only UDP transport supported in this version'
+                'DNS query for ' . $name . ' failed: Requested transport "' . $transport . '" not available, only UDP is supported in this version'
             ));
         }
 
@@ -71,7 +71,7 @@ public function doQuery($nameserver, $transport, $queryData, $name)
         try {
             $conn = $this->createConnection($nameserver, $transport);
         } catch (\Exception $e) {
-            return Promise\reject(new \RuntimeException('Unable to connect to DNS server: ' . $e->getMessage(), 0, $e));
+            return Promise\reject(new \RuntimeException('DNS query for ' . $name . ' failed: Unable to connect to DNS server: ' . $e->getMessage(), 0, $e));
         }
 
         $deferred = new Deferred(function ($resolve, $reject) use (&$timer, $loop, &$conn, $name) {
@@ -91,7 +91,7 @@ public function doQuery($nameserver, $transport, $queryData, $name)
             });
         }
 
-        $conn->on('data', function ($data) use ($conn, $parser, $deferred, $timer, $loop) {
+        $conn->on('data', function ($data) use ($conn, $parser, $deferred, $timer, $loop, $name) {
             $conn->end();
             if ($timer !== null) {
                 $loop->cancelTimer($timer);
@@ -105,7 +105,7 @@ public function doQuery($nameserver, $transport, $queryData, $name)
             }
 
             if ($response->header->isTruncated()) {
-                $deferred->reject(new \RuntimeException('The server returned a truncated result for the UDP query, retrying via TCP is currently not supported'));
+                $deferred->reject(new \RuntimeException('DNS query for ' . $name . ' failed: The server returned a truncated result for a UDP query, but retrying via TCP is currently not supported'));
                 return;
             }
 

tests/Query/ExecutorTest.php

@@ -2,6 +2,7 @@
 
 namespace React\Tests\Dns\Query;
 
+use Clue\React\Block;
 use React\Dns\Query\Executor;
 use React\Dns\Query\Query;
 use React\Dns\Model\Message;
@@ -51,10 +52,8 @@ public function resolveShouldRejectIfRequestIsLargerThan512Bytes()
         $query = new Query(str_repeat('a', 512).'.igor.io', Message::TYPE_A, Message::CLASS_IN, 1345656451);
         $promise = $this->executor->query('8.8.8.8:53', $query);
 
-        $promise->then(
-            null,
-            $this->expectCallableOnce()
-        );
+        $this->setExpectedException('RuntimeException', 'DNS query for ' . $query->name . ' failed: Requested transport "tcp" not available, only UDP is supported in this version');
+        Block\await($promise, $this->loop);
     }
 
     /** @test */
@@ -81,17 +80,8 @@ public function resolveShouldCloseConnectionWhenCancelled()
 
         $promise->cancel();
 
-        $errorback = $this->createCallableMock();
-        $errorback
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->logicalAnd(
-                $this->isInstanceOf('React\Dns\Query\CancellationException'),
-                $this->attribute($this->equalTo('DNS query for igor.io has been cancelled'), 'message')
-            )
-        );
-
-        $promise->then($this->expectCallableNever(), $errorback);
+        $this->setExpectedException('React\Dns\Query\CancellationException', 'DNS query for igor.io has been cancelled');
+        Block\await($promise, $this->loop);
     }
 
     /** @test */
@@ -108,16 +98,8 @@ public function resolveShouldNotStartOrCancelTimerWhenCancelledWithTimeoutIsNull
 
         $promise->cancel();
 
-        $errorback = $this->createCallableMock();
-        $errorback
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->logicalAnd(
-                $this->isInstanceOf('React\Dns\Query\CancellationException'),
-                $this->attribute($this->equalTo('DNS query for igor.io has been cancelled'), 'message')
-            ));
-
-        $promise->then($this->expectCallableNever(), $errorback);
+        $this->setExpectedException('React\Dns\Query\CancellationException', 'DNS query for igor.io has been cancelled');
+        Block\await($promise, $this->loop);
     }
 
     /** @test */
@@ -162,21 +144,13 @@ public function resolveShouldFailIfUdpThrow()
             ->expects($this->once())
             ->method('createConnection')
             ->with('8.8.8.8:53', 'udp')
-            ->will($this->throwException(new \Exception()));
+            ->will($this->throwException(new \Exception('Nope')));
 
         $query = new Query('igor.io', Message::TYPE_A, Message::CLASS_IN, 1345656451);
         $promise = $this->executor->query('8.8.8.8:53', $query);
 
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->callback(function($e) {
-                return $e instanceof \RuntimeException &&
-                    strpos($e->getMessage(), 'Unable to connect to DNS server') === 0;
-            }));
-
-        $promise->then($this->expectCallableNever(), $mock);
+        $this->setExpectedException('RuntimeException', 'DNS query for igor.io failed: Unable to connect to DNS server: Nope');
+        Block\await($promise, $this->loop);
     }
 
     /** @test */
@@ -238,22 +212,14 @@ public function resolveShouldCloseConnectionOnTimeout()
                 return $timer;
             }));
 
-        $callback = $this->expectCallableNever();
-
-        $errorback = $this->createCallableMock();
-        $errorback
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->logicalAnd(
-                $this->isInstanceOf('React\Dns\Query\TimeoutException'),
-                $this->attribute($this->equalTo('DNS query for igor.io timed out'), 'message')
-            ));
-
         $query = new Query('igor.io', Message::TYPE_A, Message::CLASS_IN, 1345656451);
-        $this->executor->query('8.8.8.8:53', $query)->then($callback, $errorback);
+        $promise = $this->executor->query('8.8.8.8:53', $query);
 
         $this->assertNotNull($timerCallback);
         $timerCallback();
+
+        $this->setExpectedException('React\Dns\Query\TimeoutException', 'DNS query for igor.io timed out');
+        Block\await($promise, $this->loop);
     }
 
     private function returnStandardResponse()