Просмотр исходного кода

[tests] Fix expected exception message on wrong key type.

Redis >= 2.8 returns -WRONGTYPE errors instead of -ERR when executing
operations on wrong key type (such as trying to LPUSH on a string key).

Luckily for us, phpunit's @expectedExceptionMessage annotation actually
does not perform an exact match but works on a substring so we just omit
the initial part of the exception message to make the test work.
Daniele Alessandri 12 лет назад
Родитель
Сommit
46920c9c77
75 измененных файлов с 78 добавлено и 78 удалено
  1. 1 1
      tests/PHPUnit/ConnectionTestCase.php
  2. 2 2
      tests/Predis/ClientTest.php
  3. 1 1
      tests/Predis/Command/HashDeleteTest.php
  4. 1 1
      tests/Predis/Command/HashExistsTest.php
  5. 1 1
      tests/Predis/Command/HashGetAllTest.php
  6. 1 1
      tests/Predis/Command/HashGetMultipleTest.php
  7. 1 1
      tests/Predis/Command/HashGetTest.php
  8. 1 1
      tests/Predis/Command/HashIncrementByFloatTest.php
  9. 1 1
      tests/Predis/Command/HashIncrementByTest.php
  10. 1 1
      tests/Predis/Command/HashKeysTest.php
  11. 1 1
      tests/Predis/Command/HashLengthTest.php
  12. 1 1
      tests/Predis/Command/HashSetMultipleTest.php
  13. 1 1
      tests/Predis/Command/HashSetPreserveTest.php
  14. 1 1
      tests/Predis/Command/HashSetTest.php
  15. 1 1
      tests/Predis/Command/HashValuesTest.php
  16. 1 1
      tests/Predis/Command/KeySortTest.php
  17. 1 1
      tests/Predis/Command/ListIndexTest.php
  18. 1 1
      tests/Predis/Command/ListInsertTest.php
  19. 1 1
      tests/Predis/Command/ListLengthTest.php
  20. 1 1
      tests/Predis/Command/ListPopFirstTest.php
  21. 2 2
      tests/Predis/Command/ListPopLastPushHeadTest.php
  22. 1 1
      tests/Predis/Command/ListPopLastTest.php
  23. 1 1
      tests/Predis/Command/ListPushHeadTest.php
  24. 1 1
      tests/Predis/Command/ListPushHeadXTest.php
  25. 1 1
      tests/Predis/Command/ListPushTailTest.php
  26. 1 1
      tests/Predis/Command/ListPushTailXTest.php
  27. 1 1
      tests/Predis/Command/ListRangeTest.php
  28. 1 1
      tests/Predis/Command/ListRemoveTest.php
  29. 1 1
      tests/Predis/Command/ListSetTest.php
  30. 1 1
      tests/Predis/Command/ListTrimTest.php
  31. 1 1
      tests/Predis/Command/SetAddTest.php
  32. 1 1
      tests/Predis/Command/SetCardinalityTest.php
  33. 1 1
      tests/Predis/Command/SetDifferenceStoreTest.php
  34. 1 1
      tests/Predis/Command/SetDifferenceTest.php
  35. 1 1
      tests/Predis/Command/SetIntersectionStoreTest.php
  36. 1 1
      tests/Predis/Command/SetIntersectionTest.php
  37. 1 1
      tests/Predis/Command/SetIsMemberTest.php
  38. 1 1
      tests/Predis/Command/SetMembersTest.php
  39. 2 2
      tests/Predis/Command/SetMoveTest.php
  40. 1 1
      tests/Predis/Command/SetPopTest.php
  41. 1 1
      tests/Predis/Command/SetRandomMemberTest.php
  42. 1 1
      tests/Predis/Command/SetRemoveTest.php
  43. 1 1
      tests/Predis/Command/SetUnionStoreTest.php
  44. 1 1
      tests/Predis/Command/SetUnionTest.php
  45. 1 1
      tests/Predis/Command/StringAppendTest.php
  46. 1 1
      tests/Predis/Command/StringBitCountTest.php
  47. 1 1
      tests/Predis/Command/StringBitOpTest.php
  48. 1 1
      tests/Predis/Command/StringDecrementByTest.php
  49. 1 1
      tests/Predis/Command/StringDecrementTest.php
  50. 1 1
      tests/Predis/Command/StringGetBitTest.php
  51. 1 1
      tests/Predis/Command/StringGetRangeTest.php
  52. 1 1
      tests/Predis/Command/StringGetSetTest.php
  53. 1 1
      tests/Predis/Command/StringGetTest.php
  54. 1 1
      tests/Predis/Command/StringIncrementByFloatTest.php
  55. 1 1
      tests/Predis/Command/StringIncrementByTest.php
  56. 1 1
      tests/Predis/Command/StringIncrementTest.php
  57. 1 1
      tests/Predis/Command/StringSetBitTest.php
  58. 1 1
      tests/Predis/Command/StringSetRangeTest.php
  59. 1 1
      tests/Predis/Command/StringStrlenTest.php
  60. 1 1
      tests/Predis/Command/ZSetAddTest.php
  61. 1 1
      tests/Predis/Command/ZSetCardinalityTest.php
  62. 1 1
      tests/Predis/Command/ZSetCountTest.php
  63. 1 1
      tests/Predis/Command/ZSetIncrementByTest.php
  64. 1 1
      tests/Predis/Command/ZSetIntersectionStoreTest.php
  65. 1 1
      tests/Predis/Command/ZSetRangeByScoreTest.php
  66. 1 1
      tests/Predis/Command/ZSetRangeTest.php
  67. 1 1
      tests/Predis/Command/ZSetRankTest.php
  68. 1 1
      tests/Predis/Command/ZSetRemoveRangeByRankTest.php
  69. 1 1
      tests/Predis/Command/ZSetRemoveRangeByScoreTest.php
  70. 1 1
      tests/Predis/Command/ZSetRemoveTest.php
  71. 1 1
      tests/Predis/Command/ZSetReverseRangeByScoreTest.php
  72. 1 1
      tests/Predis/Command/ZSetReverseRangeTest.php
  73. 1 1
      tests/Predis/Command/ZSetReverseRankTest.php
  74. 1 1
      tests/Predis/Command/ZSetScoreTest.php
  75. 1 1
      tests/Predis/Command/ZSetUnionStoreTest.php

+ 1 - 1
tests/PHPUnit/ConnectionTestCase.php

@@ -262,7 +262,7 @@ abstract class ConnectionTestCase extends StandardTestCase
         $connection->writeCommand($profile->createCommand('rpush', array('foo', 'baz')));
 
         $this->assertInstanceOf('Predis\ResponseError', $error = $connection->read());
-        $this->assertSame('ERR Operation against a key holding the wrong kind of value', $error->getMessage());
+        $this->assertRegExp('/[ERR|WRONGTYPE] Operation against a key holding the wrong kind of value/', $error->getMessage());
     }
 
     /**

+ 2 - 2
tests/Predis/ClientTest.php

@@ -313,7 +313,7 @@ class ClientTest extends StandardTestCase
     /**
      * @group disconnected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testExecuteCommandThrowsExceptionOnRedisError()
     {
@@ -376,7 +376,7 @@ class ClientTest extends StandardTestCase
     /**
      * @group disconnected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testCallingRedisCommandThrowsExceptionOnServerError()
     {

+ 1 - 1
tests/Predis/Command/HashDeleteTest.php

@@ -102,7 +102,7 @@ class HashDeleteTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashExistsTest.php

@@ -91,7 +91,7 @@ class HashExistsTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashGetAllTest.php

@@ -92,7 +92,7 @@ class HashGetAllTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashGetMultipleTest.php

@@ -108,7 +108,7 @@ class HashGetMultipleTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashGetTest.php

@@ -88,7 +88,7 @@ class HashGetTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashIncrementByFloatTest.php

@@ -113,7 +113,7 @@ class HashIncrementByFloatTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashIncrementByTest.php

@@ -113,7 +113,7 @@ class HashIncrementByTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashKeysTest.php

@@ -92,7 +92,7 @@ class HashKeysTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashLengthTest.php

@@ -87,7 +87,7 @@ class HashLengthTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashSetMultipleTest.php

@@ -114,7 +114,7 @@ class HashSetMultipleTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashSetPreserveTest.php

@@ -91,7 +91,7 @@ class HashSetPreserveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashSetTest.php

@@ -90,7 +90,7 @@ class HashSetTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/HashValuesTest.php

@@ -92,7 +92,7 @@ class HashValuesTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/KeySortTest.php

@@ -258,7 +258,7 @@ class KeySortTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListIndexTest.php

@@ -103,7 +103,7 @@ class ListIndexTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListInsertTest.php

@@ -111,7 +111,7 @@ class ListInsertTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListLengthTest.php

@@ -98,7 +98,7 @@ class ListLengthTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListPopFirstTest.php

@@ -98,7 +98,7 @@ class ListPopFirstTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 2 - 2
tests/Predis/Command/ListPopLastPushHeadTest.php

@@ -117,7 +117,7 @@ class ListPopLastPushHeadTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
     {
@@ -130,7 +130,7 @@ class ListPopLastPushHeadTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfDestinationKey()
     {

+ 1 - 1
tests/Predis/Command/ListPopLastTest.php

@@ -98,7 +98,7 @@ class ListPopLastTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListPushHeadTest.php

@@ -101,7 +101,7 @@ class ListPushHeadTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListPushHeadXTest.php

@@ -99,7 +99,7 @@ class ListPushHeadXTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListPushTailTest.php

@@ -101,7 +101,7 @@ class ListPushTailTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListPushTailXTest.php

@@ -99,7 +99,7 @@ class ListPushTailXTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListRangeTest.php

@@ -142,7 +142,7 @@ class ListRangeTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListRemoveTest.php

@@ -126,7 +126,7 @@ class ListRemoveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListSetTest.php

@@ -100,7 +100,7 @@ class ListSetTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ListTrimTest.php

@@ -132,7 +132,7 @@ class ListTrimTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetAddTest.php

@@ -100,7 +100,7 @@ class SetAddTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetCardinalityTest.php

@@ -96,7 +96,7 @@ class SetCardinalityTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetDifferenceStoreTest.php

@@ -119,7 +119,7 @@ class SetDifferenceStoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
     {

+ 1 - 1
tests/Predis/Command/SetDifferenceTest.php

@@ -121,7 +121,7 @@ class SetDifferenceTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetIntersectionStoreTest.php

@@ -132,7 +132,7 @@ class SetIntersectionStoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
     {

+ 1 - 1
tests/Predis/Command/SetIntersectionTest.php

@@ -132,7 +132,7 @@ class SetIntersectionTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetIsMemberTest.php

@@ -100,7 +100,7 @@ class SetIsMemberTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetMembersTest.php

@@ -92,7 +92,7 @@ class SetMembersTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 2 - 2
tests/Predis/Command/SetMoveTest.php

@@ -93,7 +93,7 @@ class SetMoveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
     {
@@ -107,7 +107,7 @@ class SetMoveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfDestinationKey()
     {

+ 1 - 1
tests/Predis/Command/SetPopTest.php

@@ -89,7 +89,7 @@ class SetPopTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetRandomMemberTest.php

@@ -97,7 +97,7 @@ class SetRandomMemberTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetRemoveTest.php

@@ -104,7 +104,7 @@ class SetRemoveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/SetUnionStoreTest.php

@@ -119,7 +119,7 @@ class SetUnionStoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongTypeOfSourceKey()
     {

+ 1 - 1
tests/Predis/Command/SetUnionTest.php

@@ -121,7 +121,7 @@ class SetUnionTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringAppendTest.php

@@ -99,7 +99,7 @@ class StringAppendTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringBitCountTest.php

@@ -96,7 +96,7 @@ class StringBitCountTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringBitOpTest.php

@@ -168,7 +168,7 @@ class StringBitOpTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnInvalidSourceKey()
     {

+ 1 - 1
tests/Predis/Command/StringDecrementByTest.php

@@ -124,7 +124,7 @@ class StringDecrementByTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringDecrementTest.php

@@ -111,7 +111,7 @@ class StringDecrementTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringGetBitTest.php

@@ -117,7 +117,7 @@ class StringGetBitTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringGetRangeTest.php

@@ -102,7 +102,7 @@ class StringGetRangeTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringGetSetTest.php

@@ -88,7 +88,7 @@ class StringGetSetTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringGetTest.php

@@ -109,7 +109,7 @@ class StringGetTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringIncrementByFloatTest.php

@@ -124,7 +124,7 @@ class StringIncrementByFloatTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringIncrementByTest.php

@@ -124,7 +124,7 @@ class StringIncrementByTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringIncrementTest.php

@@ -98,7 +98,7 @@ class StringIncrementTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringSetBitTest.php

@@ -133,7 +133,7 @@ class StringSetBitTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringSetRangeTest.php

@@ -127,7 +127,7 @@ class StringSetRangeTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/StringStrlenTest.php

@@ -98,7 +98,7 @@ class StringStrlenTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetAddTest.php

@@ -113,7 +113,7 @@ class ZSetAddTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetCardinalityTest.php

@@ -87,7 +87,7 @@ class ZSetCardinalityTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetCountTest.php

@@ -120,7 +120,7 @@ class ZSetCountTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetIncrementByTest.php

@@ -87,7 +87,7 @@ class ZSetIncrementByTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetIntersectionStoreTest.php

@@ -181,7 +181,7 @@ class ZSetIntersectionStoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRangeByScoreTest.php

@@ -218,7 +218,7 @@ class ZSetRangeByScoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRangeTest.php

@@ -141,7 +141,7 @@ class ZSetRangeTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRankTest.php

@@ -90,7 +90,7 @@ class ZSetRankTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRemoveRangeByRankTest.php

@@ -102,7 +102,7 @@ class ZSetRemoveRangeByRankTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRemoveRangeByScoreTest.php

@@ -102,7 +102,7 @@ class ZSetRemoveRangeByScoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetRemoveTest.php

@@ -89,7 +89,7 @@ class ZSetRemoveTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetReverseRangeByScoreTest.php

@@ -218,7 +218,7 @@ class ZSetReverseRangeByScoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetReverseRangeTest.php

@@ -141,7 +141,7 @@ class ZSetReverseRangeTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetReverseRankTest.php

@@ -90,7 +90,7 @@ class ZSetReverseRankTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetScoreTest.php

@@ -90,7 +90,7 @@ class ZSetScoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {

+ 1 - 1
tests/Predis/Command/ZSetUnionStoreTest.php

@@ -198,7 +198,7 @@ class ZSetUnionStoreTest extends CommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR Operation against a key holding the wrong kind of value
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
      */
     public function testThrowsExceptionOnWrongType()
     {