Skip to content

Commit fa2937a

Browse files
nagachikanagachika
committed
merge revision(s) r45034,r45037:
 * 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
1 parent 5807ff6 commit fa2937a

File tree

10 files changed

+38
-32
lines changed

10 files changed

+38
-32
lines changed

‎ChangeLog

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Wed Jul 23 23:11:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
2+
3+
* test/socket/test_socket.rb: unix socket is required by test case.
4+
5+
Wed Jul 23 23:11:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
6+
7+
* test/socket/test_addrinfo.rb: remove unused variables.
8+
* test/socket/test_nonblock.rb: ditto.
9+
* test/socket/test_socket.rb: ditto.
10+
* test/socket/test_unix.rb: ditto.
11+
* test/testunit/test_parallel.rb: ditto.
12+
* test/webrick/test_filehandler.rb: ditto.
13+
* test/xmlrpc/test_features.rb: ditto.
14+
* test/zlib/test_zlib.rb: ditto.
15+
116
Wed Jul 23 23:05:19 2014 Tanaka Akira <akr@fsij.org>
217

318
* ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all

‎test/socket/test_addrinfo.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def test_socket_connect
140140
ai = Addrinfo.new(s1.getsockname)
141141
s2 = Socket.new(:INET, :STREAM, 0)
142142
s2.connect(ai)
143-
s3, sender_addr = s1.accept
143+
s3, _ = s1.accept
144144
s2.send("test-socket-connect", 0)
145145
assert_equal("test-socket-connect", s3.recv(100))
146146
ensure
@@ -166,7 +166,7 @@ def test_socket_connect_nonblock
166166
rescue Errno::EISCONN
167167
end
168168
end
169-
s3, sender_addr = s1.accept
169+
s3, _ = s1.accept
170170
s2.send("test-socket-connect-nonblock", 0)
171171
assert_equal("test-socket-connect-nonblock", s3.recv(100))
172172
ensure

‎test/socket/test_nonblock.rb

+6-7
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def test_udp_recvfrom_nonblock
6464
mesg, inet_addr = u1.recvfrom_nonblock(100)
6565
assert_equal(4, inet_addr.length)
6666
assert_equal("aaa", mesg)
67-
af, port, host, addr = inet_addr
68-
u2_port, u2_addr = Socket.unpack_sockaddr_in(u2.getsockname)
67+
_, port, _, _ = inet_addr
68+
u2_port, _ = Socket.unpack_sockaddr_in(u2.getsockname)
6969
assert_equal(u2_port, port)
7070
assert_raise(IO::WaitReadable) { u1.recvfrom_nonblock(100) }
7171
u2.send("", 0, u1.getsockname)
@@ -111,8 +111,8 @@ def test_socket_recvfrom_nonblock
111111
IO.select [s1]
112112
mesg, sockaddr = s1.recvfrom_nonblock(100)
113113
assert_equal("aaa", mesg)
114-
port, addr = Socket.unpack_sockaddr_in(sockaddr)
115-
s2_port, s2_addr = Socket.unpack_sockaddr_in(s2.getsockname)
114+
port, _ = Socket.unpack_sockaddr_in(sockaddr)
115+
s2_port, _ = Socket.unpack_sockaddr_in(s2.getsockname)
116116
assert_equal(s2_port, port)
117117
ensure
118118
s1.close if s1
@@ -121,7 +121,7 @@ def test_socket_recvfrom_nonblock
121121

122122
def tcp_pair
123123
serv = TCPServer.new("127.0.0.1", 0)
124-
af, port, host, addr = serv.addr
124+
_, port, _, addr = serv.addr
125125
c = TCPSocket.new(addr, port)
126126
s = serv.accept
127127
if block_given?
@@ -268,7 +268,7 @@ def test_recv_nonblock_error
268268

269269
def test_connect_nonblock_error
270270
serv = TCPServer.new("127.0.0.1", 0)
271-
af, port, host, addr = serv.addr
271+
_, port, _, _ = serv.addr
272272
c = Socket.new(:INET, :STREAM)
273273
begin
274274
c.connect_nonblock(Socket.sockaddr_in(port, "127.0.0.1"))
@@ -284,7 +284,6 @@ def test_accept_nonblock_error
284284
serv = Socket.new(:INET, :STREAM)
285285
serv.bind(Socket.sockaddr_in(0, "127.0.0.1"))
286286
serv.listen(5)
287-
port = serv.local_address.ip_port
288287
begin
289288
s, _ = serv.accept_nonblock
290289
rescue Errno::EWOULDBLOCK

‎test/socket/test_socket.rb

+4-5
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ def test_udp_server
359359
# Mac OS X may sets IFDISABLED as FreeBSD does
360360
ulSIOCGIFFLAGS = 3223349521
361361
ulSIOCGIFINFO_IN6 = 3224398156
362-
ulSIOCGIFAFLAG_IN6 = 3240126793
363362
ulIFF_POINTOPOINT = 0x10
364363
ulND6_IFF_IFDISABLED = 8
365364
in6_ondireq = ifr_name
@@ -403,7 +402,7 @@ def test_udp_server
403402
raise "no response from #{ai.inspect} #{nd6options}ping=#{ping_p}"
404403
end
405404
msg2, addr = s.recvmsg
406-
msg2, remote_address, local_address = Marshal.load(msg2)
405+
msg2, _, _ = Marshal.load(msg2)
407406
assert_equal(msg1, msg2)
408407
assert_equal(ai.ip_address, addr.ip_address)
409408
}
@@ -454,7 +453,7 @@ def test_timestamp
454453
Addrinfo.udp("127.0.0.1", 0).bind {|s2|
455454
s1.setsockopt(:SOCKET, :TIMESTAMP, true)
456455
s2.send "a", 0, s1.local_address
457-
msg, addr, rflags, stamp = s1.recvmsg
456+
msg, _, _, stamp = s1.recvmsg
458457
assert_equal("a", msg)
459458
assert(stamp.cmsg_is?(:SOCKET, :TIMESTAMP))
460459
}
@@ -481,7 +480,7 @@ def test_timestampns
481480
return
482481
end
483482
s2.send "a", 0, s1.local_address
484-
msg, addr, rflags, stamp = s1.recvmsg
483+
msg, _, _, stamp = s1.recvmsg
485484
assert_equal("a", msg)
486485
assert(stamp.cmsg_is?(:SOCKET, :TIMESTAMPNS))
487486
}
@@ -503,7 +502,7 @@ def test_bintime
503502
Addrinfo.udp("127.0.0.1", 0).bind {|s2|
504503
s1.setsockopt(:SOCKET, :BINTIME, true)
505504
s2.send "a", 0, s1.local_address
506-
msg, addr, rflags, stamp = s1.recvmsg
505+
msg, _, _, stamp = s1.recvmsg
507506
assert_equal("a", msg)
508507
assert(stamp.cmsg_is?(:SOCKET, :BINTIME))
509508
}

‎test/socket/test_unix.rb

+7-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_fd_passing_n
5353
end
5454
assert_equal(1, ret)
5555
ret = s2.recvmsg(:scm_rights=>true)
56-
data, srcaddr, flags, *ctls = ret
56+
_, _, _, *ctls = ret
5757
recv_io_ary = []
5858
ctls.each {|ctl|
5959
next if ctl.level != Socket::SOL_SOCKET || ctl.type != Socket::SCM_RIGHTS
@@ -90,7 +90,7 @@ def test_fd_passing_n2
9090
end
9191
assert_equal(1, ret)
9292
ret = s2.recvmsg(:scm_rights=>true)
93-
data, srcaddr, flags, *ctls = ret
93+
_, _, _, *ctls = ret
9494
recv_io_ary = []
9595
ctls.each {|ctl|
9696
next if ctl.level != Socket::SOL_SOCKET || ctl.type != Socket::SCM_RIGHTS
@@ -422,7 +422,6 @@ def test_unix_socket_pair_with_block
422422
end
423423

424424
def test_unix_socket_pair_close_on_exec
425-
pair = nil
426425
UNIXSocket.pair {|s1, s2|
427426
assert(s1.close_on_exec?)
428427
assert(s2.close_on_exec?)
@@ -465,7 +464,7 @@ def test_getcred_ucred
465464
Dir.mktmpdir {|d|
466465
sockpath = "#{d}/sock"
467466
serv = Socket.unix_server_socket(sockpath)
468-
c = Socket.unix(sockpath)
467+
Socket.unix(sockpath)
469468
s, = serv.accept
470469
cred = s.getsockopt(:SOCKET, :PEERCRED)
471470
inspect = cred.inspect
@@ -481,7 +480,7 @@ def test_getcred_xucred
481480
Dir.mktmpdir {|d|
482481
sockpath = "#{d}/sock"
483482
serv = Socket.unix_server_socket(sockpath)
484-
c = Socket.unix(sockpath)
483+
Socket.unix(sockpath)
485484
s, = serv.accept
486485
cred = s.getsockopt(0, Socket::LOCAL_PEERCRED)
487486
inspect = cred.inspect
@@ -499,7 +498,7 @@ def test_sendcred_ucred
499498
s, = serv.accept
500499
s.setsockopt(:SOCKET, :PASSCRED, 1)
501500
c.print "a"
502-
msg, cliend_ai, rflags, cred = s.recvmsg
501+
msg, _, _, cred = s.recvmsg
503502
inspect = cred.inspect
504503
assert_equal("a", msg)
505504
assert_match(/ pid=#{$$} /, inspect)
@@ -518,7 +517,7 @@ def test_sendcred_sockcred
518517
s, = serv.accept
519518
s.setsockopt(0, Socket::LOCAL_CREDS, 1)
520519
c.print "a"
521-
msg, cliend_ai, rflags, cred = s.recvmsg
520+
msg, _, _, cred = s.recvmsg
522521
assert_equal("a", msg)
523522
inspect = cred.inspect
524523
assert_match(/ uid=#{Process.uid} /, inspect)
@@ -537,7 +536,7 @@ def test_sendcred_cmsgcred
537536
c = Socket.unix(sockpath)
538537
s, = serv.accept
539538
c.sendmsg("a", 0, nil, [:SOCKET, Socket::SCM_CREDS, ""])
540-
msg, cliend_ai, rflags, cred = s.recvmsg
539+
msg, _, _, cred = s.recvmsg
541540
assert_equal("a", msg)
542541
inspect = cred.inspect
543542
assert_match(/ pid=#{$$} /, inspect)

‎test/testunit/test_parallel.rb

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def test_p
9090
def test_done
9191
timeout(10) do
9292
@worker_in.puts "run #{TESTS}/ptest_forth.rb test"
93-
i = 0
9493
6.times { @worker_out.gets }
9594
buf = @worker_out.gets
9695
assert_match(/^done (.+?)$/, buf)

‎test/webrick/test_filehandler.rb

-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ def test_non_disclosure_name
184184

185185
def test_directory_traversal
186186
config = { :DocumentRoot => File.dirname(__FILE__), }
187-
this_file = File.basename(__FILE__)
188187
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
189188
http = Net::HTTP.new(addr, port)
190189
req = Net::HTTP::Get.new("/../../")
@@ -199,7 +198,6 @@ def test_directory_traversal
199198
def test_unwise_in_path
200199
if windows?
201200
config = { :DocumentRoot => File.dirname(__FILE__), }
202-
this_file = File.basename(__FILE__)
203201
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
204202
http = Net::HTTP.new(addr, port)
205203
req = Net::HTTP::Get.new("/..%5c..")

‎test/xmlrpc/test_features.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ def test_nil_create
1616

1717
XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
1818
XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, false)
19-
assert_raise(RuntimeError) { str = c.methodCall("test", *@params) }
19+
assert_raise(RuntimeError) { c.methodCall("test", *@params) }
2020

2121
XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
2222
XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
23-
assert_nothing_raised { str = c.methodCall("test", *@params) }
23+
assert_nothing_raised { c.methodCall("test", *@params) }
2424
end
2525
end
2626

‎test/zlib/test_zlib.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def test_closed_p
162162
assert_equal(false, z.closed?)
163163
z << "foo"
164164
assert_equal(false, z.closed?)
165-
s = z.finish
165+
z.finish
166166
assert_equal(false, z.closed?)
167167
z.close
168168
assert_equal(true, z.closed?)
@@ -309,9 +309,6 @@ def test_inflate
309309
def test_inflate_partial_input
310310
deflated = Zlib::Deflate.deflate "\0"
311311

312-
a = deflated[0...2]
313-
b = deflated[2..-1]
314-
315312
z = Zlib::Inflate.new
316313

317314
inflated = ""

‎version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.2"
22
#define RUBY_RELEASE_DATE "2014-07-23"
3-
#define RUBY_PATCHLEVEL 180
3+
#define RUBY_PATCHLEVEL 181
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 7

0 commit comments

Comments
 (0)