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 879BD200B46 for ; Sat, 16 Jul 2016 12:21:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 86345160A5F; Sat, 16 Jul 2016 10:21:33 +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 CFEA2160A5D for ; Sat, 16 Jul 2016 12:21:32 +0200 (CEST) Received: (qmail 12961 invoked by uid 500); 16 Jul 2016 10:21:32 -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 12952 invoked by uid 99); 16 Jul 2016 10:21:32 -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; Sat, 16 Jul 2016 10:21:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BE194E04AC; Sat, 16 Jul 2016 10:21:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Message-Id: <4b5c66599a4a46d3b8ee90efb2a9e072@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch commit: updated refs/heads/master to 4476595 Date: Sat, 16 Jul 2016 10:21:31 +0000 (UTC) archived-at: Sat, 16 Jul 2016 10:21:33 -0000 Repository: couchdb-couch Updated Branches: refs/heads/master b0d21d26d -> 4476595e0 test: use global test timeout macro, should fix test on slow ci vms Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/4476595e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/4476595e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/4476595e Branch: refs/heads/master Commit: 4476595e028cde574c447024ed68c132203661e9 Parents: b0d21d2 Author: Jan Lehnardt Authored: Sat Jul 16 12:21:08 2016 +0200 Committer: Jan Lehnardt Committed: Sat Jul 16 12:21:24 2016 +0200 ---------------------------------------------------------------------- test/couchdb_compaction_daemon_tests.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/4476595e/test/couchdb_compaction_daemon_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_compaction_daemon_tests.erl b/test/couchdb_compaction_daemon_tests.erl index 3228031..4c35fb7 100644 --- a/test/couchdb_compaction_daemon_tests.erl +++ b/test/couchdb_compaction_daemon_tests.erl @@ -211,7 +211,7 @@ wait_compaction_started(DbName) -> true -> ok end end, - case test_util:wait(WaitFun, 10000) of + case test_util:wait(WaitFun, ?TIMEOUT) of timeout -> erlang:error({assertion_failed, [{module, ?MODULE}, @@ -228,7 +228,7 @@ wait_compaction_finished(DbName) -> false -> ok end end, - case test_util:wait(WaitFun, 10000) of + case test_util:wait(WaitFun, ?TIMEOUT) of timeout -> erlang:error({assertion_failed, [{module, ?MODULE},