1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/test_syslog.rb (TestSyslog#test_log): In AIX, each output line of LOG_PERROR to stderr has an additional empty line appended, so skip that line.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
odaira 2014-10-04 07:35:43 +00:00
parent bebb4e9dea
commit 11ad7c4dbe
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Oct 4 16:24:41 2014 Rei Odaira <Rei.Odaira@gmail.com>
* test/test_syslog.rb (TestSyslog#test_log): In AIX, each output
line of LOG_PERROR to stderr has an additional empty line appended,
so skip that line.
Sat Oct 4 16:05:49 2014 Rei Odaira <Rei.Odaira@gmail.com> Sat Oct 4 16:05:49 2014 Rei Odaira <Rei.Odaira@gmail.com>
* test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path): * test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path):

8
test/test_syslog.rb
View File

@ -146,6 +146,10 @@ class TestSyslog < Test::Unit::TestCase
2.times { 2.times {
re = syslog_line_regex("syslog_test", "test1 - hello, world!") re = syslog_line_regex("syslog_test", "test1 - hello, world!")
line = stderr[0].gets line = stderr[0].gets
# In AIX, each LOG_PERROR output line has an appended empty line.
if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
line = stderr[0].gets
end
m = re.match(line) m = re.match(line)
assert_not_nil(m) assert_not_nil(m)
if m[1] if m[1]
@ -157,6 +161,10 @@ class TestSyslog < Test::Unit::TestCase
2.times { 2.times {
re = syslog_line_regex("syslog_test", "test2 - pid") re = syslog_line_regex("syslog_test", "test2 - pid")
line = stderr[0].gets line = stderr[0].gets
# In AIX, each LOG_PERROR output line has an appended empty line.
if /aix/ =~ RUBY_PLATFORM && line =~ /^$/
line = stderr[0].gets
end
m = re.match(line) m = re.match(line)
assert_not_nil(m) assert_not_nil(m)
assert_not_nil(m[1]) assert_not_nil(m[1])