diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/fake_sorted_set_gem/sorted_set.rb | 8 | ||||
| -rw-r--r-- | test/test_sorted_set.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/fixtures/fake_sorted_set_gem/sorted_set.rb b/test/fixtures/fake_sorted_set_gem/sorted_set.rb index 02c9721fa2..f45a766303 100644 --- a/test/fixtures/fake_sorted_set_gem/sorted_set.rb +++ b/test/fixtures/fake_sorted_set_gem/sorted_set.rb @@ -1,3 +1,9 @@ -class SortedSet +Object.instance_exec do + # Remove the constant to cancel autoload that would be fired by + # `class SortedSet` and cause circular require. + remove_const :SortedSet if const_defined?(:SortedSet) +end + +class SortedSet < Set # ... end diff --git a/test/test_sorted_set.rb b/test/test_sorted_set.rb index 1ac6ee929a..f7ad7af299 100644 --- a/test/test_sorted_set.rb +++ b/test/test_sorted_set.rb @@ -22,7 +22,7 @@ class TC_SortedSet < Test::Unit::TestCase rescue Exception => e e.message end - raise r unless r.match? /has been extracted/ + raise r unless r.match?(/has been extracted/) RUBY end |