diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-21 08:47:32 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-21 08:47:32 -0700 |
| commit | 11d1d7ad4dfff7f47867f48c1a1b99f3ee15f89c (patch) | |
| tree | 1dda55ce3256589d3da89fbede242dcead822899 | |
| parent | a778318b2ab2f432984eabb60d129acce4612bc5 (diff) | |
| parent | a9f6c8f8e1034ba8cb8838bc0136828826f66af8 (diff) | |
| download | rails-11d1d7ad4dfff7f47867f48c1a1b99f3ee15f89c.tar.gz rails-11d1d7ad4dfff7f47867f48c1a1b99f3ee15f89c.tar.bz2 rails-11d1d7ad4dfff7f47867f48c1a1b99f3ee15f89c.zip | |
Merge pull request #11959 from razielgn/skip-global-safe-tests-on-rubinius
Skip tests involving $SAFE on Rubinius, it's not supported.
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 4 | ||||
| -rw-r--r-- | activesupport/test/core_ext/thread_test.rb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 939bd7bfa8..62105da49c 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -24,3 +24,7 @@ Thread.abort_on_exception = true # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true + +def rubinius_skip(message = '') + skip message if RUBY_ENGINE == 'rbx' +end diff --git a/activesupport/test/core_ext/thread_test.rb b/activesupport/test/core_ext/thread_test.rb index cf1b48d511..54d2dcd8dd 100644 --- a/activesupport/test/core_ext/thread_test.rb +++ b/activesupport/test/core_ext/thread_test.rb @@ -73,6 +73,8 @@ class ThreadExt < ActiveSupport::TestCase end def test_thread_variable_security + rubinius_skip "$SAFE is not supported on Rubinius." + t = Thread.new { sleep } assert_raises(SecurityError) do |