Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test error #1236

Merged
merged 1 commit into from Mar 9, 2017
Merged

Fix test error #1236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/test_helper.rb
View file
Open in desktop
Expand Up @@ -4,9 +4,10 @@
begin
require "bundler/setup"
rescue LoadError
require "net/http"
require "timeout"
end

require "net/http"
require "timeout"
require "minitest/autorun"
require "minitest/pride"
require "puma"
Expand Down Expand Up @@ -34,7 +35,6 @@ def hit(uris)
return results
end

require 'timeout'
module TimeoutEveryTestCase
def run(*)
if !!ENV['CI']
Expand Down