소스 검색

[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.

Conflicts:
	tests/Predis/Command/StringPreciseSetExpireTest.php
	tests/Predis/Command/StringSetExpireTest.php
Daniele Alessandri 10 년 전
부모
커밋
7060c013ba
2개의 변경된 파일4개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 4
      tests/Predis/Command/StringPreciseSetExpireTest.php
  2. 2 2
      tests/Predis/Command/StringSetExpireTest.php

+ 2 - 4
tests/Predis/Command/StringPreciseSetExpireTest.php

@@ -118,8 +118,7 @@ class StringPreciseSetExpireTest extends PredisCommandTestCase
     /**
      * @group connected
      * @expectedException Predis\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()
     {
@@ -129,8 +128,7 @@ class StringPreciseSetExpireTest extends PredisCommandTestCase
     /**
      * @group connected
      * @expectedException Predis\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()
     {

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

@@ -119,7 +119,7 @@ class StringSetExpireTest extends PredisCommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR invalid expire time in SETEX
+     * @expectedExceptionMessage ERR invalid expire time
      */
     public function testThrowsExceptionOnZeroTTL()
     {
@@ -129,7 +129,7 @@ class StringSetExpireTest extends PredisCommandTestCase
     /**
      * @group connected
      * @expectedException Predis\ServerException
-     * @expectedExceptionMessage ERR invalid expire time in SETEX
+     * @expectedExceptionMessage ERR invalid expire time
      */
     public function testThrowsExceptionOnNegativeTTL()
     {