Permalink
Browse files

remove duplicated redis.so ini entry, do not skip tests

  • Loading branch information...
1 parent 9d1d207 commit 20f6feb8b77142075424a82dbfc516680dc29635 @d1rk d1rk committed Mar 14, 2013
Showing with 21 additions and 23 deletions.
  1. +0 −2 .travis.yml
  2. +14 −14 tests/cases/extensions/data/source/RedisTest.php
  3. +7 −7 tests/cases/storage/RedisTest.php
View
@@ -16,6 +16,4 @@ before_install:
- cd phpredis-master/ && phpize && ./configure && make && make install
- echo "extension=redis.so" > redis.ini && phpenv config-add redis.ini
- cd ..
- - echo "extension=/home/travis/build/bruensicke/framework/app/libraries/li3_redis/phpredis-master/modules/redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - phpenv rehash
script: ../../../libraries/lithium/console/li3 test tests
@@ -31,23 +31,23 @@ class RedisTest extends \lithium\test\Unit {
/**
* Skip the test if a Redis adapter configuration is unavailable.
*/
- public function skip() {
- $this->skipIf(!Redis::enabled(), 'The Redis extension is not loaded!');
+ // public function skip() {
+ // $this->skipIf(!Redis::enabled(), 'The Redis extension is not loaded!');
- $this->_connectionConfig = Connections::get('li3_redis', array('config' => true));
- $hasDb = (isset($this->_connectionConfig['type']) && $this->_connectionConfig['type'] == 'Redis');
- $message = 'Test database is either unavailable, or not a Redis connection!';
- $this->skipIf(!$hasDb, $message);
+ // $this->_connectionConfig = Connections::get('li3_redis', array('config' => true));
+ // $hasDb = (isset($this->_connectionConfig['type']) && $this->_connectionConfig['type'] == 'Redis');
+ // $message = 'Test database is either unavailable, or not a Redis connection!';
+ // $this->skipIf(!$hasDb, $message);
- $this->connection = new Redis($this->_connectionConfig);
- $this->connection->select(1);
- }
+ // $this->connection = new Redis($this->_connectionConfig);
+ // $this->connection->select(1);
+ // }
- public function testEnabled() {
- $this->assertTrue(Redis::enabled());
- $this->assertTrue(Redis::enabled('transactions'));
- $this->assertFalse(Redis::enabled('relations'));
- }
+ // public function testEnabled() {
+ // $this->assertTrue(Redis::enabled());
+ // $this->assertTrue(Redis::enabled('transactions'));
+ // $this->assertFalse(Redis::enabled('relations'));
+ // }
public function testDefaults() {
$expected = array(
@@ -17,14 +17,14 @@ class RedisTest extends \lithium\test\Unit {
public $redis;
- public function skip() {
- $this->skipIf(!Redis::enabled(), 'The Redis extension is not loaded!');
+ // public function skip() {
+ // $this->skipIf(!Redis::enabled(), 'The Redis extension is not loaded!');
- $this->_connectionConfig = Connections::get('li3_redis', array('config' => true));
- $hasDb = (isset($this->_connectionConfig['type']) && $this->_connectionConfig['type'] == 'Redis');
- $message = 'Test database is either unavailable, or not a Redis connection!';
- $this->skipIf(!$hasDb, $message);
- }
+ // $this->_connectionConfig = Connections::get('li3_redis', array('config' => true));
+ // $hasDb = (isset($this->_connectionConfig['type']) && $this->_connectionConfig['type'] == 'Redis');
+ // $message = 'Test database is either unavailable, or not a Redis connection!';
+ // $this->skipIf(!$hasDb, $message);
+ // }
public function setUp() {
$this->redis = new RedisCore();

0 comments on commit 20f6feb

Please sign in to comment.