From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 95F591F4C3 for ; Wed, 30 Oct 2019 09:23:57 +0000 (UTC) From: Eric Wong To: mogilefs-client-public@bogomips.org Subject: [PATCH 2/3] fix more indentation warnings Date: Wed, 30 Oct 2019 09:23:56 +0000 Message-Id: <20191030092357.30238-3-e@80x24.org> In-Reply-To: <20191030092357.30238-1-e@80x24.org> References: <20191030092357.30238-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Not sure how or why I missed these with commit 4e0f8155a62711ae ("fix indentation warnings with ruby trunk"), but this cleans them up. --- lib/mogilefs/new_file/stream.rb | 4 ++-- test/test_fresh.rb | 4 ++-- test/test_http_reader.rb | 4 ++-- test/test_mogilefs.rb | 16 ++++++++-------- test/test_mogilefs_integration.rb | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/mogilefs/new_file/stream.rb b/lib/mogilefs/new_file/stream.rb index 2207a13..4396b8b 100644 --- a/lib/mogilefs/new_file/stream.rb +++ b/lib/mogilefs/new_file/stream.rb @@ -58,8 +58,8 @@ def commit end read_response(@to_io) # raises on errors create_close(@devid, @uri, @bytes_uploaded) - ensure - @to_io.close if @to_io && ! @to_io.closed? + ensure + @to_io.close if @to_io && ! @to_io.closed? end def start_sock(sock, uri) diff --git a/test/test_fresh.rb b/test/test_fresh.rb index ff7bae6..b8ae292 100644 --- a/test/test_fresh.rb +++ b/test/test_fresh.rb @@ -247,8 +247,8 @@ def test_create_update_delete_class assert_equal 1, tmp["mindevcount"] assert_equal "MultipleHosts(1)", tmp["replpolicy"] @admin.update_class(domain, "klassy", 2) - ensure - @admin.delete_class(domain, "klassy") rescue nil + ensure + @admin.delete_class(domain, "klassy") rescue nil end def test_device_file_add diff --git a/test/test_http_reader.rb b/test/test_http_reader.rb index f6f0055..e2d8842 100644 --- a/test/test_http_reader.rb +++ b/test/test_http_reader.rb @@ -16,8 +16,8 @@ def rsock assert_nil th.value assert_kind_of IO, r r - ensure - s.close + ensure + s.close end def test_short_to_s diff --git a/test/test_mogilefs.rb b/test/test_mogilefs.rb index 186e88a..45d4452 100644 --- a/test/test_mogilefs.rb +++ b/test/test_mogilefs.rb @@ -590,8 +590,8 @@ def assert_get_paths_args(expect, *args) assert_equal "foo", tmp.delete("domain") assert_equal expect, tmp c.backend.shutdown - ensure - sock.close + ensure + sock.close end def test_get_paths_args @@ -762,8 +762,8 @@ def test_list_keys_verbose_ordering # implementation detail th.join received.map! { |(key,_,_)| key } assert_equal %w(a b c d e), received - ensure - sock.close + ensure + sock.close end def test_list_keys_verbose_retry_eof # implementation detail @@ -806,8 +806,8 @@ def test_list_keys_verbose_retry_eof # implementation detail th.join received.map! { |(key,_,_)| key } assert_equal %w(a b c d e), received - ensure - sock.close + ensure + sock.close end def test_list_keys_verbose_retry_truncated # implementation detail @@ -851,8 +851,8 @@ def test_list_keys_verbose_retry_truncated # implementation detail th.join received.map! { |(key,_,_)| key } assert_equal %w(a b c d e), received - ensure - sock.close + ensure + sock.close end def test_sleep diff --git a/test/test_mogilefs_integration.rb b/test/test_mogilefs_integration.rb index 6d16cd7..13ae3f1 100644 --- a/test/test_mogilefs_integration.rb +++ b/test/test_mogilefs_integration.rb @@ -242,8 +242,8 @@ def test_new_file_content_md5 assert_raises(MogileFS::Backend::UnregClassError) { @client.new_file("a", :class => "non-existent") } - ensure - r.close if r + ensure + r.close if r end def test_store_content_opts