Explorar o código

[tests] Do not check exception message for connection timeouts.

Given the IP address we use for this test (the standard IP assigned by
operating systems when unable to get one lease from a DHCP server), on
certain kernels or network stacks we can get different messages such
as "No route to host". Since we just need to make sure that our test
does not take more than 1 seconds abiding by the sub-second timeout,
we can just live with that.
Daniele Alessandri %!s(int64=11) %!d(string=hai) anos
pai
achega
66f98186f0
Modificáronse 1 ficheiros con 1 adicións e 8 borrados
  1. 1 8
      tests/PHPUnit/ConnectionTestCase.php

+ 1 - 8
tests/PHPUnit/ConnectionTestCase.php

@@ -281,17 +281,10 @@ abstract class ConnectionTestCase extends StandardTestCase
     /**
      * @group connected
      * @group slow
+     * @expectedException Predis\Connection\ConnectionException
      */
     public function testThrowsExceptionOnConnectionTimeout()
     {
-        // We must differentiate here since OS X can randomly emit up to three
-        // different error messages while other platforms are more consistent.
-        if (strcasecmp(PHP_OS, 'darwin') == 0) {
-            $this->setExpectedException('Predis\Connection\ConnectionException');
-        } else {
-            $this->setExpectedException('Predis\Connection\ConnectionException', 'Connection timed out');
-        }
-
         $connection = $this->getConnection($_, false, array('host' => '169.254.10.10', 'timeout' => 0.5));
 
         $connection->connect();