Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2FB7B107F7 for ; Fri, 17 Jan 2014 21:51:25 +0000 (UTC) Received: (qmail 77615 invoked by uid 500); 17 Jan 2014 21:50:31 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 76841 invoked by uid 500); 17 Jan 2014 21:50:12 -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 76280 invoked by uid 99); 17 Jan 2014 21:50:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 21:50:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 32D88374ED; Fri, 17 Jan 2014 21:50:02 +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 Date: Fri, 17 Jan 2014 21:50:20 -0000 Message-Id: <06c3c9d6a3c94291a84422e21105c819@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] git commit: Mock rexi:kill because of new governor Mock rexi:kill because of new governor Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/3d58e434 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/3d58e434 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/3d58e434 Branch: refs/heads/import Commit: 3d58e4349554f05676c754b9e2e9778a1e9c5be7 Parents: 0158038 Author: Adam Kocoloski Authored: Mon Feb 11 21:11:49 2013 -0500 Committer: Adam Kocoloski Committed: Mon Feb 11 21:11:49 2013 -0500 ---------------------------------------------------------------------- src/fabric_view.erl | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/3d58e434/src/fabric_view.erl ---------------------------------------------------------------------- diff --git a/src/fabric_view.erl b/src/fabric_view.erl index 63ab3f4..48cbe9a 100644 --- a/src/fabric_view.erl +++ b/src/fabric_view.erl @@ -308,6 +308,8 @@ is_progress_possible_test() -> ?assertEqual(is_progress_possible(mk_cnts(T5)),false). remove_overlapping_shards_test() -> + meck:new(rexi), + meck:expect(rexi, kill, fun(_, _) -> ok end), EndPoint = 2 bsl 31, T1 = [[0,10],[11,20],[21,EndPoint-1]], Shards = mk_cnts(T1,3),