From 672552a1e8dc6dcd558fef697007ef34034f2cd9 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 12:59:34 -0400
Subject: [PATCH] Make tests skip redis integration if the extension is not
 installed

---
 tests/Ion/Cache/Driver/RedisDriver2Test.php | 35 ++++++++++++++-------
 tests/Ion/Cache/Driver/RedisDriverTest.php  | 17 ++++++++--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index 4f2ecead..b6b6ecaa 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -15,22 +15,33 @@ class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 
-		// Setup config with port and password
-		$container = new Container();
-		$container->set('config', new Config([
-			'redis' => [
-				'host' => 'localhost',
-				'port' => 6379,
-				'password' => '',
-				'database' => 13,
-			]
-		]));
-		$this->driver = new RedisDriver($container);
+		if ( ! class_exists('Redis'))
+		{
+			$this->markTestSkipped('Redis extension not installed');
+		}
+		else
+		{
+			// Setup config with port and password
+			$container = new Container();
+			$container->set('config', new Config([
+				'redis' => [
+					'host' => 'localhost',
+					'port' => 6379,
+					'password' => '',
+					'database' => 13,
+				]
+			]));
+			$this->driver = new RedisDriver($container);
+		}
 	}
 
 	public function tearDown()
 	{
 		parent::tearDown();
-		$this->driver->__destruct();
+
+		if ( ! is_null($this->driver))
+		{
+			$this->driver->__destruct();
+		}
 	}
 }
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/RedisDriverTest.php b/tests/Ion/Cache/Driver/RedisDriverTest.php
index 171a3324..9200dc61 100644
--- a/tests/Ion/Cache/Driver/RedisDriverTest.php
+++ b/tests/Ion/Cache/Driver/RedisDriverTest.php
@@ -12,12 +12,25 @@ class CacheRedisDriverTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->driver = new RedisDriver($this->container);
+
+		if ( ! class_exists('Redis'))
+		{
+			$this->markTestSkipped('Redis extension not installed');
+		}
+		else
+		{
+			$this->driver = new RedisDriver($this->container);
+		}
 	}
 
 	public function tearDown()
 	{
 		parent::tearDown();
-		$this->driver->__destruct();
+
+		if ( ! is_null($this->driver))
+		{
+			$this->driver->__destruct();
+		}
+
 	}
 }
\ No newline at end of file