1 files changed, 0 insertions, 60 deletions
diff --git a/Predis-upstream.patch b/Predis-upstream.patch
deleted file mode 100644
index 22bea4a..0000000
--- a/Predis-upstream.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d09c4f32f3650d30f84c90f161304a4034a0f86f Mon Sep 17 00:00:00 2001
-From: Daniele Alessandri <suppakilla@gmail.com>
-Date: Tue, 21 Oct 2014 11:16:55 +0200
-Subject: [PATCH] [tests] Relax checks on invalid expire time messages.
-
-Previously there was a bug in Redis that returned the wrong command
-in -ERR messages when passing an invalid expire time with SETEX and
-PSETEX. Now that the bug has been fixed and that travis-ci uses a an
-updated version of Redis, our test suite turned red.
----
- tests/Predis/Command/StringPreciseSetExpireTest.php | 6 ++----
- tests/Predis/Command/StringSetExpireTest.php        | 4 ++--
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/tests/Predis/Command/StringPreciseSetExpireTest.php b/tests/Predis/Command/StringPreciseSetExpireTest.php
-index 77df02c..c93744e 100644
---- a/tests/Predis/Command/StringPreciseSetExpireTest.php
-+++ b/tests/Predis/Command/StringPreciseSetExpireTest.php
-@@ -93,8 +93,7 @@ public function testThrowsExceptionOnNonIntegerTTL()
-     /**
-      * @group connected
-      * @expectedException \Predis\Response\ServerException
--     * @expectedExceptionMessage ERR invalid expire time in SETEX
--     * @todo Should not Redis return PSETEX instead of SETEX here?
-+     * @expectedExceptionMessage ERR invalid expire time
-      */
-     public function testThrowsExceptionOnZeroTTL()
-     {
-@@ -104,8 +103,7 @@ public function testThrowsExceptionOnZeroTTL()
-     /**
-      * @group connected
-      * @expectedException \Predis\Response\ServerException
--     * @expectedExceptionMessage ERR invalid expire time in SETEX
--     * @todo Should not Redis return PSETEX instead of SETEX here?
-+     * @expectedExceptionMessage ERR invalid expire time
-      */
-     public function testThrowsExceptionOnNegativeTTL()
-     {
-diff --git a/tests/Predis/Command/StringSetExpireTest.php b/tests/Predis/Command/StringSetExpireTest.php
-index 59ff77b..b52e9fa 100644
---- a/tests/Predis/Command/StringSetExpireTest.php
-+++ b/tests/Predis/Command/StringSetExpireTest.php
-@@ -94,7 +94,7 @@ public function testThrowsExceptionOnNonIntegerTTL()
-     /**
-      * @group connected
-      * @expectedException \Predis\Response\ServerException
--     * @expectedExceptionMessage ERR invalid expire time in SETEX
-+     * @expectedExceptionMessage ERR invalid expire time
-      */
-     public function testThrowsExceptionOnZeroTTL()
-     {
-@@ -104,7 +104,7 @@ public function testThrowsExceptionOnZeroTTL()
-     /**
-      * @group connected
-      * @expectedException \Predis\Response\ServerException
--     * @expectedExceptionMessage ERR invalid expire time in SETEX
-+     * @expectedExceptionMessage ERR invalid expire time
-      */
-     public function testThrowsExceptionOnNegativeTTL()
-     {