From 852e8a2d31ce183223f185be8488854841c29c8d Mon Sep 17 00:00:00 2001 From: Toshiaki Koshiba Date: Sat, 2 Mar 2013 22:47:39 +0900 Subject: [PATCH 1/4] use memcached gem memcache-client is already deprecated https://github.com/mperham/memcache-client#memcache-client-is-deprecated-as-of-august-2010--it-will-be-supported-through-2010-but-new-code-should-use-dalli-instead --- padrino-cache/test/test_stores.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/padrino-cache/test/test_stores.rb b/padrino-cache/test/test_stores.rb index bd00c84a6..22cdd9d1e 100644 --- a/padrino-cache/test/test_stores.rb +++ b/padrino-cache/test/test_stores.rb @@ -40,13 +40,13 @@ def bar; "bar"; end HERE_DOC begin - require 'memcache' + require 'Memcached' # we're just going to assume memcached is running on the default port - Padrino::Cache::Store::Memcache.new(::MemCache.new('127.0.0.1:11211', :exception_retry_limit => 1)).set('ping','alive') + Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1)).set('ping','alive') describe "MemcacheStore" do def setup - Padrino.cache = Padrino::Cache::Store::Memcache.new(::MemCache.new('127.0.0.1:11211', :exception_retry_limit => 1)) + Padrino.cache = Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1)) Padrino.cache.flush end From 62b1ce8f87b24f1cbafa730b438cbc955b37ae33 Mon Sep 17 00:00:00 2001 From: Toshiaki Koshiba Date: Sat, 2 Mar 2013 23:13:01 +0900 Subject: [PATCH 2/4] if can not connect memcached, skip memcache with memcached server tests --- padrino-cache/test/test_stores.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/padrino-cache/test/test_stores.rb b/padrino-cache/test/test_stores.rb index 22cdd9d1e..59e8ba279 100644 --- a/padrino-cache/test/test_stores.rb +++ b/padrino-cache/test/test_stores.rb @@ -43,7 +43,11 @@ def bar; "bar"; end require 'Memcached' # we're just going to assume memcached is running on the default port Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1)).set('ping','alive') - +rescue LoadError + warn "Skipping memcache with memcached library tests" +rescue Memcached::SystemError + warn "Skipping memcache with memcached server tests" +else describe "MemcacheStore" do def setup Padrino.cache = Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1)) @@ -56,8 +60,6 @@ def teardown eval COMMON_TESTS end -rescue LoadError - warn "Skipping memcache with memcached library tests" end begin From 4065ccf63f836536f7696b4b4b56a0dc8ba13d6c Mon Sep 17 00:00:00 2001 From: Toshiaki Koshiba Date: Sat, 2 Mar 2013 23:20:01 +0900 Subject: [PATCH 3/4] if can not connect redis, skip redis with redis server tests --- padrino-cache/test/test_stores.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/padrino-cache/test/test_stores.rb b/padrino-cache/test/test_stores.rb index 59e8ba279..0621474ea 100644 --- a/padrino-cache/test/test_stores.rb +++ b/padrino-cache/test/test_stores.rb @@ -88,6 +88,11 @@ def teardown begin require 'redis' Padrino::Cache::Store::Redis.new(::Redis.new(:host => '127.0.0.1', :port => 6379, :db => 0).set('ping','alive')) +rescue LoadError + warn "Skipping redis with redis library tests" +rescue Redis::CannotConnectError + warn "Skipping redis with redis server tests" +else describe "RedisStore" do def setup Padrino.cache = Padrino::Cache::Store::Redis.new(::Redis.new(:host => '127.0.0.1', :port => 6379, :db => 0)) @@ -108,8 +113,6 @@ def teardown eval COMMON_TESTS end -rescue LoadError - warn "Skipping redis tests" end begin From a122b4a8217cb497c2ef64a8a9b27c3f907e3fe1 Mon Sep 17 00:00:00 2001 From: Toshiaki Koshiba Date: Sat, 2 Mar 2013 23:22:22 +0900 Subject: [PATCH 4/4] divide skip cause for Mongo test - cause 1 : Mongo lib LoadError - cause 2 : can not connect to Mongo server --- padrino-cache/test/test_stores.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/padrino-cache/test/test_stores.rb b/padrino-cache/test/test_stores.rb index 0621474ea..fa61869ae 100644 --- a/padrino-cache/test/test_stores.rb +++ b/padrino-cache/test/test_stores.rb @@ -118,6 +118,11 @@ def teardown begin require 'mongo' Padrino::Cache::Store::Mongo.new(::Mongo::Connection.new('127.0.0.1', 27017).db('padrino-cache_test')) +rescue LoadError + warn "Skipping Mongo tests with Mongo library tests" +rescue Mongo::ConnectionFailure + warn "Skipping Mongo Mongo with Mongo server tests" +else describe "MongoStore" do def setup Padrino.cache = Padrino::Cache::Store::Mongo.new(::Mongo::Connection.new('127.0.0.1', 27017).db('padrino-cache_test'), {:size => 10, :collection => 'cache'}) @@ -131,8 +136,6 @@ def teardown eval COMMON_TESTS end -rescue LoadError, Mongo::ConnectionFailure - warn "Skipping Mongo tests" end describe "FileStore" do