|
|
e5b264 |
From d204330c6ed4bbc6f15717d6ecbf597c586387db Mon Sep 17 00:00:00 2001
|
|
|
e5b264 |
From: "Peter M. Goldstein" <peter.m.goldstein@gmail.com>
|
|
|
e5b264 |
Date: Mon, 23 Jun 2014 21:50:29 -0700
|
|
|
e5b264 |
Subject: [PATCH] Assorted changes to get specs to green. Clean up memcached
|
|
|
e5b264 |
processes after creation, so the processes aren't reused. Remove use of the
|
|
|
e5b264 |
'second' method on Array (added by ActiveSupport). Fix Travis rbx keys. Set
|
|
|
e5b264 |
value on stats spec, so it doesn't depend on server processes from other
|
|
|
e5b264 |
specs.
|
|
|
e5b264 |
|
|
|
e5b264 |
---
|
|
|
e5b264 |
test/memcached_mock.rb | 4 +++-
|
|
|
e5b264 |
test/test_active_support.rb | 36 ++++++++++++++++++++----------------
|
|
|
e5b264 |
test/test_cas_client.rb | 4 ++--
|
|
|
e5b264 |
test/test_dalli.rb | 1 +
|
|
|
e5b264 |
test/test_rack_session.rb | 7 +++++--
|
|
|
e5b264 |
5 files changed, 31 insertions(+), 21 deletions(-)
|
|
|
e5b264 |
|
|
|
e5b264 |
diff --git a/test/memcached_mock.rb b/test/memcached_mock.rb
|
|
|
e5b264 |
index 7fdd8c1..9ed167a 100644
|
|
|
e5b264 |
--- a/test/memcached_mock.rb
|
|
|
e5b264 |
+++ b/test/memcached_mock.rb
|
|
|
e5b264 |
@@ -68,12 +68,14 @@ def find_memcached
|
|
|
e5b264 |
def memcached(port=19122, args='', options={})
|
|
|
e5b264 |
memcached_server(port, args)
|
|
|
e5b264 |
yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
|
|
|
e5b264 |
+ memcached_kill(port)
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
def memcached_cas(port=19122, args='', options={})
|
|
|
e5b264 |
memcached_server(port, args)
|
|
|
e5b264 |
require 'dalli/cas/client'
|
|
|
e5b264 |
yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"], options)
|
|
|
e5b264 |
+ memcached_kill(port)
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
def memcached_server(port=19122, args='')
|
|
|
e5b264 |
@@ -82,7 +84,7 @@ def memcached_server(port=19122, args='')
|
|
|
e5b264 |
cmd = "#{Memcached.path}memcached #{args} -p #{port}"
|
|
|
e5b264 |
|
|
|
e5b264 |
$started[port] ||= begin
|
|
|
e5b264 |
- #puts "Starting: #{cmd}..."
|
|
|
e5b264 |
+ # puts "Starting: #{cmd}..."
|
|
|
e5b264 |
pid = IO.popen(cmd).pid
|
|
|
e5b264 |
at_exit do
|
|
|
e5b264 |
begin
|
|
|
e5b264 |
diff --git a/test/test_active_support.rb b/test/test_active_support.rb
|
|
|
e5b264 |
index 4af1816..b897eb9 100644
|
|
|
e5b264 |
--- a/test/test_active_support.rb
|
|
|
e5b264 |
+++ b/test/test_active_support.rb
|
|
|
e5b264 |
@@ -17,26 +17,30 @@ def cache_key
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
it 'allow mute and silence' do
|
|
|
e5b264 |
- @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
|
|
|
e5b264 |
- @dalli.mute do
|
|
|
e5b264 |
- assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
|
|
|
e5b264 |
- assert_equal 'bar', @dalli.read('foo', nil)
|
|
|
e5b264 |
+ memcached do
|
|
|
e5b264 |
+ @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
|
|
|
e5b264 |
+ @dalli.mute do
|
|
|
e5b264 |
+ assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
|
|
|
e5b264 |
+ assert_equal 'bar', @dalli.read('foo', nil)
|
|
|
e5b264 |
+ end
|
|
|
e5b264 |
+ refute @dalli.silence?
|
|
|
e5b264 |
+ @dalli.silence!
|
|
|
e5b264 |
+ assert_equal true, @dalli.silence?
|
|
|
e5b264 |
end
|
|
|
e5b264 |
- refute @dalli.silence?
|
|
|
e5b264 |
- @dalli.silence!
|
|
|
e5b264 |
- assert_equal true, @dalli.silence?
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
it 'handle nil options' do
|
|
|
e5b264 |
- @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
|
|
|
e5b264 |
- assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
|
|
|
e5b264 |
- assert_equal 'bar', @dalli.read('foo', nil)
|
|
|
e5b264 |
- assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
|
|
|
e5b264 |
- assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
|
|
|
e5b264 |
- assert_equal 1, @dalli.increment('lkjsa', 1, nil)
|
|
|
e5b264 |
- assert_equal 2, @dalli.increment('lkjsa', 1, nil)
|
|
|
e5b264 |
- assert_equal 1, @dalli.decrement('lkjsa', 1, nil)
|
|
|
e5b264 |
- assert_equal true, @dalli.delete('lkjsa')
|
|
|
e5b264 |
+ memcached do
|
|
|
e5b264 |
+ @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
|
|
|
e5b264 |
+ assert op_addset_succeeds(@dalli.write('foo', 'bar', nil))
|
|
|
e5b264 |
+ assert_equal 'bar', @dalli.read('foo', nil)
|
|
|
e5b264 |
+ assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
|
|
|
e5b264 |
+ assert_equal 18, @dalli.fetch('lkjsadlfk', nil) { 18 }
|
|
|
e5b264 |
+ assert_equal 1, @dalli.increment('lkjsa', 1, nil)
|
|
|
e5b264 |
+ assert_equal 2, @dalli.increment('lkjsa', 1, nil)
|
|
|
e5b264 |
+ assert_equal 1, @dalli.decrement('lkjsa', 1, nil)
|
|
|
e5b264 |
+ assert_equal true, @dalli.delete('lkjsa')
|
|
|
e5b264 |
+ end
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
it 'support fetch' do
|
|
|
e5b264 |
diff --git a/test/test_cas_client.rb b/test/test_cas_client.rb
|
|
|
e5b264 |
index 423e360..31e146f 100644
|
|
|
e5b264 |
--- a/test/test_cas_client.rb
|
|
|
e5b264 |
+++ b/test/test_cas_client.rb
|
|
|
e5b264 |
@@ -41,14 +41,14 @@
|
|
|
e5b264 |
# Invocation without block
|
|
|
e5b264 |
resp = dc.get_multi_cas(%w(a b c d e f))
|
|
|
e5b264 |
resp.each_pair do |k, data|
|
|
|
e5b264 |
- value, cas = [data.first, data.second]
|
|
|
e5b264 |
+ value, cas = [data.first, data[1]]
|
|
|
e5b264 |
assert_equal expected_hash[k], value
|
|
|
e5b264 |
assert(cas && cas != 0)
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
# Invocation with block
|
|
|
e5b264 |
dc.get_multi_cas(%w(a b c d e f)) do |k, data|
|
|
|
e5b264 |
- value, cas = [data.first, data.second]
|
|
|
e5b264 |
+ value, cas = [data.first, data[1]]
|
|
|
e5b264 |
assert_equal expected_hash[k], value
|
|
|
e5b264 |
assert(cas && cas != 0)
|
|
|
e5b264 |
end
|
|
|
e5b264 |
diff --git a/test/test_dalli.rb b/test/test_dalli.rb
|
|
|
e5b264 |
index fb67991..cf75ced 100644
|
|
|
e5b264 |
--- a/test/test_dalli.rb
|
|
|
e5b264 |
+++ b/test/test_dalli.rb
|
|
|
e5b264 |
@@ -147,6 +147,7 @@
|
|
|
e5b264 |
it "support stats" do
|
|
|
e5b264 |
memcached do |dc|
|
|
|
e5b264 |
# make sure that get_hits would not equal 0
|
|
|
e5b264 |
+ dc.set(:a, "1234567890"*100000)
|
|
|
e5b264 |
dc.get(:a)
|
|
|
e5b264 |
|
|
|
e5b264 |
stats = dc.stats
|
|
|
e5b264 |
diff --git a/test/test_rack_session.rb b/test/test_rack_session.rb
|
|
|
e5b264 |
index 657b061..d264b58 100644
|
|
|
e5b264 |
--- a/test/test_rack_session.rb
|
|
|
e5b264 |
+++ b/test/test_rack_session.rb
|
|
|
e5b264 |
@@ -9,13 +9,16 @@
|
|
|
e5b264 |
Rack::Session::Dalli::DEFAULT_OPTIONS[:memcache_server] = 'localhost:19129'
|
|
|
e5b264 |
|
|
|
e5b264 |
before do
|
|
|
e5b264 |
- memcached(19129) do
|
|
|
e5b264 |
- end
|
|
|
e5b264 |
+ memcached_server(19129)
|
|
|
e5b264 |
|
|
|
e5b264 |
# test memcache connection
|
|
|
e5b264 |
Rack::Session::Dalli.new(incrementor)
|
|
|
e5b264 |
end
|
|
|
e5b264 |
|
|
|
e5b264 |
+ after do
|
|
|
e5b264 |
+ memcached_kill(19129)
|
|
|
e5b264 |
+ end
|
|
|
e5b264 |
+
|
|
|
e5b264 |
let(:session_key) { Rack::Session::Dalli::DEFAULT_OPTIONS[:key] }
|
|
|
e5b264 |
let(:session_match) do
|
|
|
e5b264 |
/#{session_key}=([0-9a-fA-F]+);/
|