Skip to content

Commit

Permalink
Testing travis...
Browse files Browse the repository at this point in the history
  • Loading branch information
Pablo Cantero committed Jun 27, 2017
1 parent c808766 commit e7e5f2e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion lib/shoryuken/launcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def start_managers
logger.error { ex.backtrace.join("\n") } unless ex.backtrace.nil?
end


Process.kill('USR1', Process.pid) if @shutdowing.make_true
end
end
Expand Down
2 changes: 0 additions & 2 deletions spec/integration/launcher_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
StandardWorker.get_shoryuken_options['queue'] = queue

Shoryuken.register_worker(queue, StandardWorker)

allow(subject).to receive(:executor).and_return(Concurrent::ThreadPoolExecutor.new(min_threads: 4))
end

after do
Expand Down
5 changes: 4 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def perform(sqs_msg, body); end
# The AWS_ACCESS_KEY_ID checker is because Travis CI
# does not expose ENV variables to pull requests from forked repositories
# http://docs.travis-ci.com/user/pull-requests/
config.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?
# config.filter_run_excluding slow: true if ENV['SPEC_ALL'] != 'true' || ENV['AWS_ACCESS_KEY_ID'].nil?
config.filter_run_excluding slow: true

config.before do
Shoryuken::Client.class_variable_set :@@queues, {}
Expand All @@ -55,5 +56,7 @@ def perform(sqs_msg, body); end
Shoryuken.register_worker('default', TestWorker)

Aws.config[:stub_responses] = true

allow(Concurrent).to receive(:global_io_executor).and_return(Concurrent::ImmediateExecutor.new)
end
end

0 comments on commit e7e5f2e

Please sign in to comment.