[tests] Exlude persistent connections tests under PHP 5.3.

The get_resource_type() function does not differentiate between normal streams
and persistent streams, so we cannot really test this case.
This commit is contained in:
Daniele Alessandri
2015-07-25 21:49:18 +02:00
parent c7cae66a97
commit abf2ce0bd1
4 changed files with 20 additions and 48 deletions
@@ -484,6 +484,10 @@ abstract class PredisConnectionTestCase extends PredisTestCase
*/
protected function assertPersistentConnection(NodeConnectionInterface $connection)
{
if (version_compare(PHP_VERSION, '5.4.0') < 0 || $this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$this->assertSame('persistent stream', get_resource_type($connection->getResource()));
}
@@ -497,6 +501,10 @@ abstract class PredisConnectionTestCase extends PredisTestCase
*/
protected function assertNonPersistentConnection(NodeConnectionInterface $connection)
{
if (version_compare(PHP_VERSION, '5.4.0') < 0 || $this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$this->assertSame('stream', get_resource_type($connection->getResource()));
}
@@ -41,13 +41,10 @@ class CompositeStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithFalseLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 0));
$this->assertNonPersistentConnection($connection1);
@@ -63,13 +60,10 @@ class CompositeStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithTrueLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 1));
$this->assertPersistentConnection($connection1);
@@ -87,13 +81,10 @@ class CompositeStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeShareResource()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => true));
$connection2 = $this->createConnectionWithParams(array('persistent' => true));
@@ -107,13 +98,10 @@ class CompositeStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeDoNotShareResourceUsingDifferentPersistentID()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 'conn1'));
$connection2 = $this->createConnectionWithParams(array('persistent' => 'conn2'));
@@ -58,13 +58,10 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithFalseLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 0));
$this->assertNonPersistentConnection($connection1);
@@ -80,13 +77,10 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithTrueLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 1));
$this->assertPersistentConnection($connection1);
@@ -104,13 +98,10 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeShareResource()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => true));
$connection2 = $this->createConnectionWithParams(array('persistent' => true));
@@ -124,13 +115,10 @@ class PhpiredisStreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeDoNotShareResourceUsingDifferentPersistentID()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 'conn1'));
$connection2 = $this->createConnectionWithParams(array('persistent' => 'conn2'));
@@ -24,13 +24,10 @@ class StreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithFalseLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 0));
$this->assertNonPersistentConnection($connection1);
@@ -46,13 +43,10 @@ class StreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentParameterWithTrueLikeValues()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 1));
$this->assertPersistentConnection($connection1);
@@ -70,13 +64,10 @@ class StreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeShareResource()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => true));
$connection2 = $this->createConnectionWithParams(array('persistent' => true));
@@ -90,13 +81,10 @@ class StreamConnectionTest extends PredisConnectionTestCase
/**
* @group connected
* @requires PHP 5.4
*/
public function testPersistentConnectionsToSameNodeDoNotShareResourceUsingDifferentPersistentID()
{
if ($this->isHHVM()) {
$this->markTestSkipped('This test does not currently work on HHVM.');
}
$connection1 = $this->createConnectionWithParams(array('persistent' => 'conn1'));
$connection2 = $this->createConnectionWithParams(array('persistent' => 'conn2'));