aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-02-03 22:41:39 +0900
committerGitHub <noreply@github.com>2018-02-03 22:41:39 +0900
commit4d99720fd3334ec8962b6076b5585ed30fb36602 (patch)
tree44bd2516eeb361720ac0008c4c1c02415abe0380 /activesupport
parentcb9e35ee0099508c9d63b12c384123e0380eb6d6 (diff)
parent9ce2405b3c7f4f555becef162ea2e8af341d47c9 (diff)
downloadrails-4d99720fd3334ec8962b6076b5585ed30fb36602.tar.gz
rails-4d99720fd3334ec8962b6076b5585ed30fb36602.tar.bz2
rails-4d99720fd3334ec8962b6076b5585ed30fb36602.zip
Merge pull request #28171 from sorra/fresh-thread-tagged-logging
Improve test for TaggedLogging "keeps each tag in their own thread"
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/tagged_logging_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index 1fabd8f7a6..e2b41cf8ee 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -74,11 +74,12 @@ class TaggedLoggingTest < ActiveSupport::TestCase
test "keeps each tag in their own thread" do
@logger.tagged("BCX") do
Thread.new do
+ @logger.info "Dull story"
@logger.tagged("OMG") { @logger.info "Cool story" }
end.join
@logger.info "Funky time"
end
- assert_equal "[OMG] Cool story\n[BCX] Funky time\n", @output.string
+ assert_equal "Dull story\n[OMG] Cool story\n[BCX] Funky time\n", @output.string
end
test "keeps each tag in their own instance" do