TravisCI: sentinel tests

yatsukhnenko · michael-grunder · commit 4fde8178fa88 · 2021-10-05T14:30:28.000-07:00
diff --git 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
@@ -134,7 +134,7 @@ PHP_METHOD(RedisSentinel, masters)
 
 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
@@ -83,6 +83,12 @@ public function testMasters()
         }
     }
 
+    public function testMyid()
+    {
+        $result = $this->sentinel->myid();
+        $this->assertTrue(is_string($result));
+    }
+
     public function testPing()
     {
         $this->assertTrue($this->sentinel->ping());

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ PHP_METHOD(RedisSentinel, masters)`
`134`	`134`
`135`	`135`	`PHP_METHOD(RedisSentinel, ping)`
`136`	`136`	`{`
`137`		`- REDIS_PROCESS_KW_CMD("PING", redis_empty_cmd, redis_boolean_response);`
	`137`	`+ REDIS_PROCESS_KW_CMD("ping", redis_empty_cmd, redis_boolean_response);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`PHP_METHOD(RedisSentinel, reset)`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,12 @@ public function testMasters()`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ public function testMyid()`
	`87`	`+ {`
	`88`	`+ $result = $this->sentinel->myid();`
	`89`	`+ $this->assertTrue(is_string($result));`
	`90`	`+ }`
	`91`	`+`
`86`	`92`	`public function testPing()`
`87`	`93`	`{`
`88`	`94`	`$this->assertTrue($this->sentinel->ping());`