From fc76cbe64b3f5a3e641d32bff68af919df7b3d9e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 7 Nov 2011 22:21:19 +0000 Subject: [PATCH] cleanup unused variable warnings --- GNUmakefile | 4 ++++ lib/mogilefs/admin.rb | 1 - test/socket_test.rb | 1 - test/test_admin.rb | 19 ------------------ test/test_admin_integration.rb | 2 +- test/test_fresh.rb | 2 +- test/test_mogilefs.rb | 30 ++++++++++++++-------------- test/test_mogilefs_integration_large_pipe.rb | 1 + test/test_mogtool_bigfile.rb | 2 +- 9 files changed, 23 insertions(+), 39 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index ee9c647..da1e1e3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -52,3 +52,7 @@ flay: $(libs) flog: $(libs) flog $(flog_flags) $^ .PHONY: $(T) Manifest.txt + +check-warnings: + @(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \ + do ruby -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || : diff --git a/lib/mogilefs/admin.rb b/lib/mogilefs/admin.rb index 6608fe1..0833bc2 100644 --- a/lib/mogilefs/admin.rb +++ b/lib/mogilefs/admin.rb @@ -11,7 +11,6 @@ class MogileFS::Admin < MogileFS::Client def each_fid low = 0 - high = nil max = get_stats('fids')['fids']['max'] diff --git a/test/socket_test.rb b/test/socket_test.rb index 2f50d72..75e852b 100644 --- a/test/socket_test.rb +++ b/test/socket_test.rb @@ -87,7 +87,6 @@ module SocketTest def timed_gets sock = MogileFS::Socket.tcp(@host, @port) accepted = @srv.accept - buf = "" assert_raises(MogileFS::UnreadableSocketError) { sock.timed_gets(0.01) } accepted.write "HI" assert_raises(MogileFS::UnreadableSocketError) { sock.timed_gets(0.01) } diff --git a/test/test_admin.rb b/test/test_admin.rb index fb46934..a7b0963 100644 --- a/test/test_admin.rb +++ b/test/test_admin.rb @@ -104,25 +104,6 @@ class TestMogileFS__Admin < TestMogileFS assert_equal expected, @client.get_domains end - def disabled_test_get_stats - @backend.stats = {} - - expected = { - 'fids' => { 'max' => '99', 'count' => '2' }, - 'device' => [ - { 'status' => 'alive', 'files' => '2', 'id' => '1', 'host' => 'rur-1' }, - { 'status' => 'alive', 'files' => '2', 'id' => '2', 'host' => 'rur-2' } - ], - 'replication' => [ - { 'files' => '2', 'class' => 'normal', 'devcount' => '2', - 'domain' => 'test' } - ], - 'file' => [{ 'files' => '2', 'class' => 'normal', 'domain' => 'test' }] - } - - assert_equal - end - def test_get_stats_fids @backend.stats = { 'fidmax' => 99, diff --git a/test/test_admin_integration.rb b/test/test_admin_integration.rb index e3de379..79fdabc 100644 --- a/test/test_admin_integration.rb +++ b/test/test_admin_integration.rb @@ -26,7 +26,7 @@ class TestAdminIntegration < TestMogIntegration assert_equal "MultipleHosts(1)", tmp["replpolicy"] assert_nothing_raised { @admin.update_class(@domain, "klassy", 2) } @admin.delete_class(@domain, "klassy") rescue nil - rescue => err + rescue @admin.delete_class(@domain, "klassy") rescue nil raise end diff --git a/test/test_fresh.rb b/test/test_fresh.rb index 48b3395..89b37b6 100644 --- a/test/test_fresh.rb +++ b/test/test_fresh.rb @@ -78,7 +78,7 @@ EOF def test_admin_setup_new_host_and_devices assert_equal [], @admin.get_hosts args = { :ip => @test_host, :port => @mogstored_http_port } - x = @admin.create_host("me", args) + @admin.create_host("me", args) yield_for_monitor_update { @admin.get_hosts.empty? or break } hosts = @admin.get_hosts assert_equal 1, hosts.size diff --git a/test/test_mogilefs.rb b/test/test_mogilefs.rb index bc17223..ce0d6b1 100644 --- a/test/test_mogilefs.rb +++ b/test/test_mogilefs.rb @@ -22,7 +22,7 @@ class TestMogileFS__MogileFS < TestMogileFS tmp = Tempfile.new('accept') accept = File.open(tmp.path, "ab") svr = Proc.new do |serv, port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.recv(4096, 0) assert(readed =~ \ @@ -48,7 +48,7 @@ class TestMogileFS__MogileFS < TestMogileFS tmp = Tempfile.new('accept') accept = File.open(tmp.path, 'ab') svr1 = Proc.new do |serv, port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.recv(4096, 0) assert(readed =~ \ @@ -59,7 +59,7 @@ class TestMogileFS__MogileFS < TestMogileFS end svr2 = Proc.new do |serv, port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.recv(4096, 0) assert(readed =~ \ @@ -95,7 +95,7 @@ class TestMogileFS__MogileFS < TestMogileFS accept = Tempfile.new('accept') svr = Proc.new do |serv, port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true accept.syswrite('.') readed = client.recv(4096, 0) @@ -213,7 +213,7 @@ class TestMogileFS__MogileFS < TestMogileFS 'key_1' => 'new_key_1', 'key_2' => 'new_key_2' } http_resp = "HTTP/1.0 200 OK\r\nContent-Length: %u\r\n" srv = Proc.new do |serv, port, size| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.readpartial(4096) assert %r{\AHEAD } =~ readed @@ -259,7 +259,7 @@ class TestMogileFS__MogileFS < TestMogileFS def test_size_http accept = Tempfile.new('accept') t = TempServer.new(Proc.new do |serv,port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.recv(4096, 0) rescue nil accept.syswrite('.') @@ -278,7 +278,7 @@ class TestMogileFS__MogileFS < TestMogileFS def test_bad_size_http tmp = Tempfile.new('accept') t = TempServer.new(Proc.new do |serv,port| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true readed = client.recv(4096, 0) rescue nil assert_equal "HEAD /path HTTP/1.0\r\n\r\n", readed @@ -301,7 +301,7 @@ class TestMogileFS__MogileFS < TestMogileFS expected = "PUT /path HTTP/1.0\r\nContent-Length: 4\r\n\r\ndata" t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true received.syswrite(client.recv(4096, 0)) client.send("HTTP/1.0 200 OK\r\n\r\n", 0) @@ -325,7 +325,7 @@ class TestMogileFS__MogileFS < TestMogileFS expected = "PUT /path HTTP/1.0\r\nContent-Length: 4\r\n\r\ndata" t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true received.syswrite(client.recv(4096, 0)) client.send("HTTP/1.0 200 OK\r\n\r\n", 0) @@ -355,7 +355,7 @@ class TestMogileFS__MogileFS < TestMogileFS expected += "data" end t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true nr = 0 loop do @@ -395,7 +395,7 @@ class TestMogileFS__MogileFS < TestMogileFS expected = "PUT /path HTTP/1.0\r\nContent-Length: 4\r\n\r\ndata" t1 = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true received1.syswrite(client.recv(4096, 0)) client.send("HTTP/1.0 500 Internal Server Error\r\n\r\n", 0) @@ -403,7 +403,7 @@ class TestMogileFS__MogileFS < TestMogileFS end) t2 = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true received2.syswrite(client.recv(4096, 0)) client.send("HTTP/1.0 200 OK\r\n\r\n", 0) @@ -430,7 +430,7 @@ class TestMogileFS__MogileFS < TestMogileFS def test_store_content_http_fail t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true client.recv(4096, 0) client.send("HTTP/1.0 500 Internal Server Error\r\n\r\n", 0) @@ -451,7 +451,7 @@ class TestMogileFS__MogileFS < TestMogileFS received = Tempfile.new('received') expected = "PUT /path HTTP/1.0\r\nContent-Length: 0\r\n\r\n" t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true received.syswrite(client.recv(4096, 0)) client.send("HTTP/1.0 200 OK\r\n\r\n", 0) @@ -501,7 +501,7 @@ class TestMogileFS__MogileFS < TestMogileFS readed = Tempfile.new('readed') t = TempServer.new(Proc.new do |serv, accept| - client, client_addr = serv.accept + client, _ = serv.accept client.sync = true nr = 0 loop do diff --git a/test/test_mogilefs_integration_large_pipe.rb b/test/test_mogilefs_integration_large_pipe.rb index 304ad16..0ddffb2 100644 --- a/test/test_mogilefs_integration_large_pipe.rb +++ b/test/test_mogilefs_integration_large_pipe.rb @@ -23,6 +23,7 @@ class TestMogileFSLargePipe< TestMogIntegration end assert_equal(nr * junk.size, @client.store_file("a", nil, r)) r.close + th.join @client.get_file_data("a") do |rd| assert_equal(nr * junk.size, @client.store_file("b", nil, rd)) end diff --git a/test/test_mogtool_bigfile.rb b/test/test_mogtool_bigfile.rb index c268184..a6de891 100644 --- a/test/test_mogtool_bigfile.rb +++ b/test/test_mogtool_bigfile.rb @@ -51,7 +51,7 @@ class TestMogtoolBigfile < TestMogIntegration # corrupt the existing data in part1 @client.store_content(part1, nil, "HELLO") - after_uris = @client.get_uris(part1) + assert_nothing_raised { @client.get_uris(part1) } # corruption is detected on verify junk = tmpfile("junk") -- 2.11.4.GIT