diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/logger/test_logger.rb | 5 | ||||
| -rw-r--r-- | test/net/ftp/test_ftp.rb | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb index f0a3e79c87..a202b762ef 100644 --- a/test/logger/test_logger.rb +++ b/test/logger/test_logger.rb @@ -321,7 +321,7 @@ class TestLogDevice < Test::Unit::TestCase r, w = IO.pipe logdev = d(w) logdev.write("msg2\n\n") - read_ready, = IO.select([r], nil, nil, 0.1) + IO.select([r], nil, nil, 0.1) w.close msg = r.read r.close @@ -347,7 +347,7 @@ class TestLogDevice < Test::Unit::TestCase r, w = IO.pipe logdev = d(w) logdev.write("msg2\n\n") - read_ready, = IO.select([r], nil, nil, 0.1) + IO.select([r], nil, nil, 0.1) assert(!w.closed?) logdev.close assert(w.closed?) @@ -481,7 +481,6 @@ class TestLogDevice < Test::Unit::TestCase logfile0 = logfile + '.0' logfile1 = logfile + '.1' logfile2 = logfile + '.2' - logfile3 = logfile + '.3' tmpfile.close(true) File.unlink(logfile) if File.exist?(logfile) File.unlink(logfile0) if File.exist?(logfile0) diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index f25e10747b..e3c01d32c0 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -428,11 +428,6 @@ class FTPTest < Test::Unit::TestCase def test_list_fail commands = [] - list_lines = [ - "-rw-r--r-- 1 0 0 0 Mar 30 11:22 foo.txt", - "-rw-r--r-- 1 0 0 0 Mar 30 11:22 bar.txt", - "-rw-r--r-- 1 0 0 0 Mar 30 11:22 baz.txt" - ] server = create_ftp_server { |sock| sock.print("220 (test_ftp).\r\n") commands.push(sock.gets) @@ -445,9 +440,6 @@ class FTPTest < Test::Unit::TestCase sock.print("200 Switching to ASCII mode.\r\n") line = sock.gets commands.push(line) - port_args = line.slice(/\APORT (.*)/, 1).split(/,/) - host = port_args[0, 4].join(".") - port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y} sock.print("200 PORT command successful.\r\n") commands.push(sock.gets) sock.print("553 Requested action not taken.\r\n") @@ -589,7 +581,6 @@ class FTPTest < Test::Unit::TestCase def test_retrbinary_fail commands = [] - binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3 server = create_ftp_server { |sock| sock.print("220 (test_ftp).\r\n") commands.push(sock.gets) @@ -600,9 +591,6 @@ class FTPTest < Test::Unit::TestCase sock.print("200 Switching to Binary mode.\r\n") line = sock.gets commands.push(line) - port_args = line.slice(/\APORT (.*)/, 1).split(/,/) - host = port_args[0, 4].join(".") - port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y} sock.print("200 PORT command successful.\r\n") commands.push(sock.gets) sock.print("550 Requested action not taken.\r\n") @@ -678,7 +666,6 @@ class FTPTest < Test::Unit::TestCase def test_storbinary_fail commands = [] binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3 - stored_data = nil server = create_ftp_server { |sock| sock.print("220 (test_ftp).\r\n") commands.push(sock.gets) @@ -689,9 +676,6 @@ class FTPTest < Test::Unit::TestCase sock.print("200 Switching to Binary mode.\r\n") line = sock.gets commands.push(line) - port_args = line.slice(/\APORT (.*)/, 1).split(/,/) - host = port_args[0, 4].join(".") - port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y} sock.print("200 PORT command successful.\r\n") commands.push(sock.gets) sock.print("452 Requested file action aborted.\r\n") |