Skip to content

Commit

Permalink
silence test errors
Browse files Browse the repository at this point in the history
  • Loading branch information
grosser committed Nov 14, 2015
1 parent 0512475 commit c2c09e0
Showing 1 changed file with 23 additions and 11 deletions.
34 changes: 23 additions & 11 deletions test/test_active_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -426,23 +426,27 @@ def cache_key

memcached_kill(new_port)

assert_equal @dalli.read('foo'), nil
silence_logger do
assert_equal @dalli.read('foo'), nil
end
end

with_cache port: new_port, :raise_errors => true do
memcached_kill(new_port)
exception = [Dalli::RingError, { :message => "No server available" }]

assert_raises(*exception) { @dalli.read 'foo' }
assert_raises(*exception) { @dalli.read 'foo', :raw => true }
assert_raises(*exception) { @dalli.write 'foo', 'bar' }
assert_raises(*exception) { @dalli.exist? 'foo' }
assert_raises(*exception) { @dalli.increment 'foo' }
assert_raises(*exception) { @dalli.decrement 'foo' }
assert_raises(*exception) { @dalli.delete 'foo' }
assert_equal @dalli.read_multi('foo', 'bar'), {}
assert_raises(*exception) { @dalli.delete 'foo' }
assert_raises(*exception) { @dalli.fetch('foo') { 42 } }
silence_logger do
assert_raises(*exception) { @dalli.read 'foo' }
assert_raises(*exception) { @dalli.read 'foo', :raw => true }
assert_raises(*exception) { @dalli.write 'foo', 'bar' }
assert_raises(*exception) { @dalli.exist? 'foo' }
assert_raises(*exception) { @dalli.increment 'foo' }
assert_raises(*exception) { @dalli.decrement 'foo' }
assert_raises(*exception) { @dalli.delete 'foo' }
assert_equal @dalli.read_multi('foo', 'bar'), {}
assert_raises(*exception) { @dalli.delete 'foo' }
assert_raises(*exception) { @dalli.fetch('foo') { 42 } }
end
end
end

Expand Down Expand Up @@ -533,6 +537,14 @@ def cache_key
end
end

def silence_logger
old = Dalli.logger.level
Dalli.logger.level = Logger::ERROR + 1
yield
ensure
Dalli.logger.level = old
end

def with_cache(options={})
port = options.delete(:port) || 19987
memcached_persistent(port) do
Expand Down

0 comments on commit c2c09e0

Please sign in to comment.