From cb09a7a2b50fad5065e2f5b32598eb15472cd1b2 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Sat, 25 Jul 2015 18:32:57 +0200 Subject: [PATCH] [tests] Use @requires annotation. --- tests/Predis/Connection/PhpiredisSocketConnectionTest.php | 1 + tests/Predis/Connection/PhpiredisStreamConnectionTest.php | 6 ++---- tests/Predis/Connection/StreamConnectionTest.php | 5 +---- tests/Predis/Connection/WebdisConnectionTest.php | 2 ++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/Predis/Connection/PhpiredisSocketConnectionTest.php b/tests/Predis/Connection/PhpiredisSocketConnectionTest.php index 46c172b8..9c80041d 100644 --- a/tests/Predis/Connection/PhpiredisSocketConnectionTest.php +++ b/tests/Predis/Connection/PhpiredisSocketConnectionTest.php @@ -13,6 +13,7 @@ namespace Predis\Connection; /** * @group ext-phpiredis + * @requires extension phpiredis */ class PhpiredisSocketConnectionTest extends PredisConnectionTestCase { diff --git a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php index 3fa10cdb..7ed41f7c 100644 --- a/tests/Predis/Connection/PhpiredisStreamConnectionTest.php +++ b/tests/Predis/Connection/PhpiredisStreamConnectionTest.php @@ -13,6 +13,7 @@ namespace Predis\Connection; /** * @group ext-phpiredis + * @requires extension phpiredis */ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase { @@ -101,13 +102,10 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase /** * @group connected + * @requires PHP 5.4 */ public function testAcceptsTcpNodelayParameter() { - if (!version_compare(PHP_VERSION, '5.4.0', '>=')) { - $this->markTestSkipped('Setting TCP_NODELAY on PHP socket streams works on PHP >= 5.4.0'); - } - $connection = new PhpiredisStreamConnection($this->getParameters(array('tcp_nodelay' => false))); $connection->connect(); $this->assertTrue($connection->isConnected()); diff --git a/tests/Predis/Connection/StreamConnectionTest.php b/tests/Predis/Connection/StreamConnectionTest.php index fded8242..c1f0753e 100644 --- a/tests/Predis/Connection/StreamConnectionTest.php +++ b/tests/Predis/Connection/StreamConnectionTest.php @@ -100,13 +100,10 @@ class StreamConnectionTest extends PredisConnectionTestCase /** * @group connected + * @requires PHP 5.4 */ public function testAcceptsTcpNodelayParameter() { - if (!version_compare(PHP_VERSION, '5.4.0', '>=')) { - $this->markTestSkipped('Setting TCP_NODELAY on PHP socket streams works on PHP >= 5.4.0'); - } - $connection = new StreamConnection($this->getParameters(array('tcp_nodelay' => false))); $connection->connect(); $this->assertTrue($connection->isConnected()); diff --git a/tests/Predis/Connection/WebdisConnectionTest.php b/tests/Predis/Connection/WebdisConnectionTest.php index 21dc1b4f..200083a3 100644 --- a/tests/Predis/Connection/WebdisConnectionTest.php +++ b/tests/Predis/Connection/WebdisConnectionTest.php @@ -19,6 +19,8 @@ use PredisTestCase; * @group ext-phpiredis * @group realm-connection * @group realm-webdis + * @requires extension phpiredis + * @requires extension curl */ class WebdisConnectionTest extends PredisTestCase {