Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9336E200B5B for ; Fri, 5 Aug 2016 16:37:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 91AED160A8E; Fri, 5 Aug 2016 14:37:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D7DEE160A64 for ; Fri, 5 Aug 2016 16:37:40 +0200 (CEST) Received: (qmail 46684 invoked by uid 500); 5 Aug 2016 14:37:40 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 46673 invoked by uid 99); 5 Aug 2016 14:37:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2016 14:37:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B409CEC22C; Fri, 5 Aug 2016 14:37:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Message-Id: <0dfdead088dc4ccb8397b73010a37f7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch-log commit: updated refs/heads/master to afe8375 Date: Fri, 5 Aug 2016 14:37:39 +0000 (UTC) archived-at: Fri, 05 Aug 2016 14:37:41 -0000 Repository: couchdb-couch-log Updated Branches: refs/heads/master 741d48c94 -> afe8375e0 Fix test failure on Windows The file writer test has a couple checks that rely on Unix style file handling for log rotation. Moving and deleting open files isn't possible on Windows so these tests are disabled there. COUCHDB-3092 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/commit/afe8375e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/tree/afe8375e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/diff/afe8375e Branch: refs/heads/master Commit: afe8375e08808f01984d03286dace759b37efc05 Parents: 741d48c Author: Paul J. Davis Authored: Fri Aug 5 09:36:19 2016 -0500 Committer: Paul J. Davis Committed: Fri Aug 5 09:37:33 2016 -0500 ---------------------------------------------------------------------- test/couch_log_writer_file_test.erl | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/blob/afe8375e/test/couch_log_writer_file_test.erl ---------------------------------------------------------------------- diff --git a/test/couch_log_writer_file_test.erl b/test/couch_log_writer_file_test.erl index 6d3f3ec..ba04261 100644 --- a/test/couch_log_writer_file_test.erl +++ b/test/couch_log_writer_file_test.erl @@ -141,16 +141,24 @@ check_reopen() -> {ok, St2} = clear_clock(couch_log_writer_file:maybe_reopen(St1)), ?assertEqual(St1, St2), - % Delete file - file:delete("./couch.log"), - {ok, St3} = clear_clock(couch_log_writer_file:maybe_reopen(St2)), - ?assert(element(3, St3) /= element(3, St2)), - - % Recreate file - file:delete("./couch.log"), - file:write_file("./couch.log", ""), - {ok, St4} = clear_clock(couch_log_writer_file:maybe_reopen(St3)), - ?assert(element(3, St4) /= element(3, St2)). + case os:type() of + {win32, _} -> + % Windows file handling doesn't work the same + % as Unix where you can move or delete an open + % file so these tests make no sense there. + yay_we_pass; + _ -> + % Delete file + file:delete("./couch.log"), + {ok, St3} = clear_clock(couch_log_writer_file:maybe_reopen(St2)), + ?assert(element(3, St3) /= element(3, St2)), + + % Recreate file + file:delete("./couch.log"), + file:write_file("./couch.log", ""), + {ok, St4} = clear_clock(couch_log_writer_file:maybe_reopen(St3)), + ?assert(element(3, St4) /= element(3, St2)) + end. clear_clock({ok, St}) ->