kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Merge branch 'master' of github.com:mperham/sidekiq

Browse source
This commit is contained in:
Mike Perham 2014-06-09 20:45:32 -07:00
commit 1a7d206333
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/helper.rb
View file

@ -31,9 +31,9 @@ Sidekiq.logger.level = Logger::ERROR
Sidekiq::Test = Minitest::Test
require 'sidekiq/redis_connection'
redis_url = ENV['REDIS_URL'] || 'redis://localhost/15'
REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost/15'
REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL, :namespace => 'testy')
Sidekiq.configure_client do |config|
config.redis = { :url => redis_url, :namespace => 'testy' }
config.redis = { :url => REDIS_URL, :namespace => 'testy' }
end

2
test/test_fetch.rb
View file

@ -4,7 +4,7 @@ require 'sidekiq/fetch'
class TestFetcher < Sidekiq::Test
describe 'fetcher' do
before do
Sidekiq.redis = { :namespace => 'fuzzy' }
Sidekiq.redis = { :url => REDIS_URL, :namespace => 'fuzzy' }
Sidekiq.redis do |conn|
conn.flushdb
conn.rpush('queue:basic', 'msg')

8
test/test_redis_connection.rb
View file

@ -70,6 +70,14 @@ class TestRedisConnection < Sidekiq::Test
describe ".determine_redis_provider" do
before do
@old_env = ENV.to_hash
end
after do
ENV.update(@old_env)
end
def with_env_var(var, uri, skip_provider=false)
vars = ['REDISTOGO_URL', 'REDIS_PROVIDER', 'REDIS_URL'] - [var]
vars.each do |v|