diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | redis_sentinel.c | 2 | ||||
| -rw-r--r-- | tests/RedisSentinelTest.php | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2a789ec6..95562ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ before_script: - redis-server --port 0 --daemonize yes --aclfile tests/users.acl --unixsocket /tmp/redis.sock - for PORT in $(seq 6379 6382) $(seq 32767 32769); do redis-server --port $PORT --daemonize yes --aclfile tests/users.acl; done - for PORT in $(seq 7000 7011); do redis-server --port $PORT --cluster-enabled yes --cluster-config-file $PORT.conf --daemonize yes --aclfile tests/users.acl; echo 127.0.0.1:$PORT >> tests/nodes/nodemap; done - - for PORT in $(seq 26379 26380); do wget raw.githubusercontent.com/redis/redis/6.0/sentinel.conf -O $PORT.conf; echo sentinel auth-pass mymaster phpredis >> $PORT.conf; redis-server $PORT.conf --port $PORT --daemonize yes --sentinel; done + - for PORT in $(seq 26379 26380); do wget raw.githubusercontent.com/redis/redis/6.0/sentinel.conf -O $PORT.conf; sed -i '/^sentinel/d' $PORT.conf; redis-server $PORT.conf --port $PORT --daemonize yes --sentinel monitor mymaster 127.0.0.1 6379 1 --sentinel sentinel auth-pass mymaster phpredis; done - echo yes | redis-cli --cluster create $(seq -f 127.0.0.1:%g 7000 7011) --cluster-replicas 3 --user phpredis -a phpredis - echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - openssl req -x509 -newkey rsa:1024 -nodes -keyout stunnel.key -out stunnel.pem -days 1 -subj '/CN=localhost' diff --git a/redis_sentinel.c b/redis_sentinel.c index 6e125f52..e5148e99 100644 --- a/redis_sentinel.c +++ b/redis_sentinel.c @@ -140,7 +140,7 @@ PHP_METHOD(RedisSentinel, myid) PHP_METHOD(RedisSentinel, ping) { - REDIS_PROCESS_KW_CMD("PING", redis_empty_cmd, redis_boolean_response); + REDIS_PROCESS_KW_CMD("ping", redis_empty_cmd, redis_boolean_response); } PHP_METHOD(RedisSentinel, reset) diff --git a/tests/RedisSentinelTest.php b/tests/RedisSentinelTest.php index 776afbf3..4d941dd9 100644 --- a/tests/RedisSentinelTest.php +++ b/tests/RedisSentinelTest.php @@ -85,11 +85,6 @@ class Redis_Sentinel_Test extends TestSuite public function testMyid() { - // Only available since 6.2.0 - if (version_compare($this->version, '6.2.0') < 0) { - $this->markTestSkipped(); - return; - } $result = $this->sentinel->myid(); $this->assertTrue(is_string($result)); } |