diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 15:11:03 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 15:11:03 +0000 |
commit | cf4207a7adf670e7c4adfcbad728c6e0e3431cd9 (patch) | |
tree | b5befc7338e545003d0b290f44541c9ed49090a9 /test/test_syslog.rb | |
parent | 4a5a6f4a2c6a20fb61ab834655fdae8ba4879196 (diff) |
merge revision(s) 32859:
* test/test_syslog.rb (TestSyslog#test_log): Do not be too
specific about the log line format. Fixes #5081.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/test_syslog.rb')
-rw-r--r-- | test/test_syslog.rb | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/test/test_syslog.rb b/test/test_syslog.rb index 063d3b1e11..4be12ff798 100644 --- a/test/test_syslog.rb +++ b/test/test_syslog.rb @@ -115,6 +115,10 @@ class TestSyslog < Test::Unit::TestCase Syslog.close if Syslog.opened? end + def syslog_line_regex(ident, message) + /(?:^| )#{Regexp.quote(ident)}(?:\[([1-9][0-9]*)\])?(?: |[: ].* )#{Regexp.quote(message)}$/ + end + def test_log stderr = IO::pipe @@ -145,11 +149,23 @@ class TestSyslog < Test::Unit::TestCase return unless Syslog.const_defined?(:LOG_PERROR) 2.times { - assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets) + re = syslog_line_regex("syslog_test", "test1 - hello, world!") + line = stderr[0].gets + m = re.match(line) + assert_not_nil(m) + if m[1] + # pid is written regardless of LOG_PID on OS X 10.7+ + assert_equal(pid, m[1].to_i) + end } 2.times { - assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets) + re = syslog_line_regex("syslog_test", "test2 - pid") + line = stderr[0].gets + m = re.match(line) + assert_not_nil(m) + assert_not_nil(m[1]) + assert_equal(pid, m[1].to_i) } end |