Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18cf051b8646
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8cca661cd5cd
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 11, 2014

  1. Bump up this timeout, since we're especially pokey on Travis.

    @headius
    headius committed Nov 11, 2014
    Copy the full SHA
    4521368 View commit details

  2. Change these so they output exception list on fail.

    @headius
    headius committed Nov 11, 2014
    Copy the full SHA
    8cca661 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 spec/regression/GH-1463_exceptions_propagate_through_fibers_spec.rb
  2. +1 −1 test/mri/ruby/envutil.rb
4 changes: 2 additions & 2 deletions spec/regression/GH-1463_exceptions_propagate_through_fibers_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
ex.should be_kind_of(StandardError)
end

thread_exceptions.should be_empty
expect(thread_exceptions).to eq []
end
end

@@ -79,7 +79,7 @@
ex.should be_kind_of(StandardError)
end

fiber_exceptions.should be_empty
expect(fiber_exceptions).to eq []
end
end
end
2 changes: 1 addition & 1 deletion test/mri/ruby/envutil.rb
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ def rubybin
LANG_ENVS = %w"LANG LC_ALL LC_CTYPE"

def invoke_ruby(args, stdin_data = "", capture_stdout = false, capture_stderr = false,
encoding: nil, timeout: 10, reprieve: 1,
encoding: nil, timeout: 20, reprieve: 1,
stdout_filter: nil, stderr_filter: nil,
rubybin: EnvUtil.rubybin,
**opt)