From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS47066 71.19.144.0/20 X-Spam-Status: No, score=-1.2 required=3.0 tests=BAYES_00,FREEMAIL_FROM, FROM_STARTS_WITH_NUMS,MSGID_FROM_MTA_HEADER shortcircuit=no autolearn=no version=3.3.2 Path: news.gmane.org!not-for-mail From: Hleb Valoshka <375gnu@gmail.com> Newsgroups: gmane.comp.lang.ruby.kgio.general Subject: [PATCH] Create own directory for every unix socket in unit tests Date: Wed, 4 Sep 2013 15:07:19 +0300 Message-ID: <1378296439-22062-1-git-send-email-375gnu@gmail.com> References: <1378296439-22062-1-git-send-email-375gnu@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1378296948 25881 80.91.229.3 (4 Sep 2013 12:15:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Sep 2013 12:15:48 +0000 (UTC) To: kgio@librelist.org Original-X-From: kgio@librelist.org Wed Sep 04 14:15:47 2013 Return-path: Envelope-to: gclrkg-kgio@m.gmane.org In-Reply-To: <1378296439-22062-1-git-send-email-375gnu@gmail.com> List-Archive: List-Help: List-Id: List-Post: List-Subscribe: List-Unsubscribe: Precedence: list Original-Sender: kgio@librelist.org Xref: news.gmane.org gmane.comp.lang.ruby.kgio.general:204 Archived-At: Received: from zedshaw2.xen.prgmr.com ([71.19.156.177]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VHBzv-0001mC-C5 for gclrkg-kgio@m.gmane.org; Wed, 04 Sep 2013 14:15:47 +0200 Received: from zedshaw2.xen.prgmr.com (unknown [IPv6:::1]) by zedshaw2.xen.prgmr.com (Postfix) with ESMTP id A4D04750A6 for ; Wed, 4 Sep 2013 12:24:44 +0000 (UTC) --- test/lib_read_write.rb | 2 ++ test/lib_server_accept.rb | 2 ++ test/test_unix_client_read_server_write.rb | 4 +++- test/test_unix_connect.rb | 5 ++++- test/test_unix_server.rb | 4 +++- test/test_unix_server_read_client_write.rb | 4 +++- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/test/lib_read_write.rb b/test/lib_read_write.rb index 5034db8..cac87b7 100644 --- a/test/lib_read_write.rb +++ b/test/lib_read_write.rb @@ -2,6 +2,7 @@ require 'test/unit' require 'io/nonblock' require 'digest/sha1' +require 'fileutils' $-w = true require 'kgio' @@ -11,6 +12,7 @@ module LibReadWriteTest def teardown @rd.close if defined?(@rd) && ! @rd.closed? @wr.close if defined?(@wr) && ! @wr.closed? + FileUtils.remove_entry_secure(@tmpdir) if defined?(@tmpdir) end def test_write_empty diff --git a/test/lib_server_accept.rb b/test/lib_server_accept.rb index ff0f733..db0d120 100644 --- a/test/lib_server_accept.rb +++ b/test/lib_server_accept.rb @@ -1,6 +1,7 @@ require 'test/unit' require 'fcntl' require 'io/nonblock' +require 'fileutils' $-w = true require 'kgio' @@ -8,6 +9,7 @@ module LibServerAccept def teardown @srv.close unless @srv.closed? + FileUtils.remove_entry_secure(@tmpdir) if defined?(@tmpdir) Kgio.accept_cloexec = true Kgio.accept_nonblock = false end diff --git a/test/test_unix_client_read_server_write.rb b/test/test_unix_client_read_server_write.rb index f5d481a..2f2b7b9 100644 --- a/test/test_unix_client_read_server_write.rb +++ b/test/test_unix_client_read_server_write.rb @@ -1,9 +1,11 @@ require './test/lib_read_write' require 'tempfile' +require 'tmpdir' class TestUnixClientReadServerWrite < Test::Unit::TestCase def setup - tmp = Tempfile.new('kgio_unix_0') + @tmpdir = Dir.mktmpdir('kgio_unix_0') + tmp = Tempfile.new('kgio_unix_0', @tmpdir) @path = tmp.path File.unlink(@path) tmp.close rescue nil diff --git a/test/test_unix_connect.rb b/test/test_unix_connect.rb index 007f422..60cb8c0 100644 --- a/test/test_unix_connect.rb +++ b/test/test_unix_connect.rb @@ -3,6 +3,7 @@ require 'io/nonblock' $-w = true require 'kgio' require 'tempfile' +require 'tmpdir' class SubSocket < Kgio::Socket attr_accessor :foo @@ -14,7 +15,8 @@ end class TestKgioUnixConnect < Test::Unit::TestCase def setup - tmp = Tempfile.new('kgio_unix_1') + @tmpdir = Dir.mktmpdir('kgio_unix_1') + tmp = Tempfile.new('kgio_unix_1', @tmpdir) @path = tmp.path File.unlink(@path) tmp.close rescue nil @@ -25,6 +27,7 @@ class TestKgioUnixConnect < Test::Unit::TestCase def teardown @srv.close unless @srv.closed? File.unlink(@path) + FileUtils.remove_entry_secure(@tmpdir) Kgio.accept_cloexec = true end diff --git a/test/test_unix_server.rb b/test/test_unix_server.rb index b15d9ec..02e4d8d 100644 --- a/test/test_unix_server.rb +++ b/test/test_unix_server.rb @@ -1,10 +1,12 @@ require 'tempfile' +require 'tmpdir' require './test/lib_server_accept' class TestKgioUNIXServer < Test::Unit::TestCase def setup - tmp = Tempfile.new('kgio_unix_2') + @tmpdir = Dir.mktmpdir('kgio_unix_2') + tmp = Tempfile.new('kgio_unix_2', @tmpdir) @path = tmp.path File.unlink(@path) tmp.close rescue nil diff --git a/test/test_unix_server_read_client_write.rb b/test/test_unix_server_read_client_write.rb index 0f57bfe..a994e01 100644 --- a/test/test_unix_server_read_client_write.rb +++ b/test/test_unix_server_read_client_write.rb @@ -1,9 +1,11 @@ require './test/lib_read_write' require 'tempfile' +require 'tmpdir' class TestUnixServerReadClientWrite < Test::Unit::TestCase def setup - tmp = Tempfile.new('kgio_unix_3') + @tmpdir = Dir.mktmpdir('kgio_unix_3') + tmp = Tempfile.new('kgio_unix_3', @tmpdir) @path = tmp.path File.unlink(@path) tmp.close rescue nil -- 1.7.10.4