archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) r45034,r45037:

Browse source 
* test/socket/test_addrinfo.rb: remove unused variables.

	* test/socket/test_nonblock.rb: ditto.

	* test/socket/test_socket.rb: ditto.

	* test/socket/test_unix.rb: ditto.

	* test/testunit/test_parallel.rb: ditto.

	* test/webrick/test_filehandler.rb: ditto.

	* test/xmlrpc/test_features.rb: ditto.

	* test/zlib/test_zlib.rb: ditto.

	* test/socket/test_socket.rb: unix socket is required by test case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-07-23 14:49:07 +00:00
parent 5807ff68f5
commit fa2937a16a
10 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/socket/test_unix.rb
View file

@ -53,7 +53,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
end
assert_equal(1, ret)
ret = s2.recvmsg(:scm_rights=>true)
data, srcaddr, flags, *ctls = ret
_, _, _, *ctls = ret
recv_io_ary = []
ctls.each {|ctl|
next if ctl.level != Socket::SOL_SOCKET || ctl.type != Socket::SCM_RIGHTS
@ -90,7 +90,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
end
assert_equal(1, ret)
ret = s2.recvmsg(:scm_rights=>true)
data, srcaddr, flags, *ctls = ret
_, _, _, *ctls = ret
recv_io_ary = []
ctls.each {|ctl|
next if ctl.level != Socket::SOL_SOCKET || ctl.type != Socket::SCM_RIGHTS
@ -422,7 +422,6 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
end
def test_unix_socket_pair_close_on_exec
pair = nil
UNIXSocket.pair {|s1, s2|
assert(s1.close_on_exec?)
assert(s2.close_on_exec?)
@ -465,7 +464,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
Dir.mktmpdir {|d|
sockpath = "#{d}/sock"
serv = Socket.unix_server_socket(sockpath)
c = Socket.unix(sockpath)
Socket.unix(sockpath)
s, = serv.accept
cred = s.getsockopt(:SOCKET, :PEERCRED)
inspect = cred.inspect
@ -481,7 +480,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
Dir.mktmpdir {|d|
sockpath = "#{d}/sock"
serv = Socket.unix_server_socket(sockpath)
c = Socket.unix(sockpath)
Socket.unix(sockpath)
s, = serv.accept
cred = s.getsockopt(0, Socket::LOCAL_PEERCRED)
inspect = cred.inspect
@ -499,7 +498,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
s, = serv.accept
s.setsockopt(:SOCKET, :PASSCRED, 1)
c.print "a"
msg, cliend_ai, rflags, cred = s.recvmsg
msg, _, _, cred = s.recvmsg
inspect = cred.inspect
assert_equal("a", msg)
assert_match(/ pid=#{$$} /, inspect)
@ -518,7 +517,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
s, = serv.accept
s.setsockopt(0, Socket::LOCAL_CREDS, 1)
c.print "a"
msg, cliend_ai, rflags, cred = s.recvmsg
msg, _, _, cred = s.recvmsg
assert_equal("a", msg)
inspect = cred.inspect
assert_match(/ uid=#{Process.uid} /, inspect)
@ -537,7 +536,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
c = Socket.unix(sockpath)
s, = serv.accept
c.sendmsg("a", 0, nil, [:SOCKET, Socket::SCM_CREDS, ""])
msg, cliend_ai, rflags, cred = s.recvmsg
msg, _, _, cred = s.recvmsg
assert_equal("a", msg)
inspect = cred.inspect
assert_match(/ pid=#{$$} /, inspect)