Apply changes from PR phpredis#955

yatsukhnenko · yatsukhnenko · commit 10b992bc0696 · 2016-09-30T18:18:29.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,17 @@
 sudo: required
 language: php
 php: 7.0
-services: redis-server
 before_install: phpize
 install: ./configure --prefix=/usr && sudo make install
-before_script: echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-script: php tests/TestRedis.php
+before_script:
+  - gem install redis
+  - mkdir -p tests/nodes/ && echo >> tests/nodes/nodemap
+  - for PORT in $(seq 6379 6382); do redis-server --port $PORT --daemonize yes; done
+  - for PORT in $(seq 7000 7011); do redis-server --port $PORT --cluster-enabled yes --cluster-config-file $PORT.conf --daemonize yes; echo 127.0.0.1:$PORT >> tests/nodes/nodemap; done
+  - wget https://raw.githubusercontent.com/antirez/redis/unstable/src/redis-trib.rb
+  - echo yes | ruby redis-trib.rb create --replicas 3 127.0.0.1:7000 127.0.0.1:7001 127.0.0.1:7002 127.0.0.1:7003 127.0.0.1:7004 127.0.0.1:7005 127.0.0.1:7006 127.0.0.1:7007 127.0.0.1:7008 127.0.0.1:7009 127.0.0.1:7010 127.0.0.1:7011
+  - echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+script:
+  - php tests/TestRedis.php --class Redis
+  - php tests/TestRedis.php --class RedisArray
+  - php tests/TestRedis.php --class RedisCluster
diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -35,7 +35,7 @@ public function testReconnectSelect() { return $this->markTestSkipped(); }
 
     /* Load our seeds on construction */
     public function __construct() {
-        $str_nodemap_file = dirname(dirname($_SERVER['PHP_SELF'])) . '/nodes/nodemap';
+        $str_nodemap_file = dirname($_SERVER['PHP_SELF']) . '/nodes/nodemap';
 
         if (!file_exists($str_nodemap_file)) {
             fprintf(STDERR, "Error:  Can't find nodemap file for seeds!\n");
