aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-11-19 09:34:51 -0800
committerGitHub <noreply@github.com>2018-11-19 09:34:51 -0800
commit317bf45c24e6d78ec5349eadd2683aca7e7fe7e8 (patch)
treef004cca7d93975c818ad81bfd8a290288ec6a6ac /activesupport/lib
parented79e52ad213de6bf4008c07d9d091ec59d34b60 (diff)
parent90266a7f1eff7c873cba7044fa0a4487b2a6ff84 (diff)
downloadrails-317bf45c24e6d78ec5349eadd2683aca7e7fe7e8.tar.gz
rails-317bf45c24e6d78ec5349eadd2683aca7e7fe7e8.tar.bz2
rails-317bf45c24e6d78ec5349eadd2683aca7e7fe7e8.zip
Merge pull request #34476 from y-yagi/fix_no_method_error_in_parallelization
Correctly handle unknown object in parallel tests
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/testing/parallelization.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/parallelization.rb b/activesupport/lib/active_support/testing/parallelization.rb
index 9c8dffa9d8..24c4f18931 100644
--- a/activesupport/lib/active_support/testing/parallelization.rb
+++ b/activesupport/lib/active_support/testing/parallelization.rb
@@ -15,6 +15,8 @@ module ActiveSupport
end
def record(reporter, result)
+ raise DRb::DRbConnError if result.is_a?(DRb::DRbUnknown)
+
reporter.synchronize do
reporter.record(result)
end