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 1691917711 for ; Thu, 9 Apr 2015 17:25:33 +0000 (UTC) Received: (qmail 79929 invoked by uid 500); 9 Apr 2015 17:25:32 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 79878 invoked by uid 500); 9 Apr 2015 17:25: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 79869 invoked by uid 99); 9 Apr 2015 17:25: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; Thu, 09 Apr 2015 17:25:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EB77DFF97; Thu, 9 Apr 2015 17:25:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Message-Id: <18f8de5b16644e21bc070a63f5eeaeb1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 16ee370 Date: Thu, 9 Apr 2015 17:25:32 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/master 60e3a0c2d -> 16ee3706a Handle case when cluster is already set up Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/16ee3706 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/16ee3706 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/16ee3706 Branch: refs/heads/master Commit: 16ee3706a482ee9c68fc0cf5a4abfca9e47758a6 Parents: 60e3a0c Author: Alexander Shorin Authored: Thu Apr 9 20:25:03 2015 +0300 Committer: Alexander Shorin Committed: Thu Apr 9 20:25:03 2015 +0300 ---------------------------------------------------------------------- dev/run | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/16ee3706/dev/run ---------------------------------------------------------------------- diff --git a/dev/run b/dev/run index 9afa22c..8a853e8 100755 --- a/dev/run +++ b/dev/run @@ -395,7 +395,8 @@ def finish_cluster(port, user, pswd): {'Authorization': basic_auth_header(user, pswd), 'Content-Type': 'application/json'}) resp = conn.getresponse() - assert resp.status == 201, resp.read() + # 400 for already set up'ed cluster + assert resp.status in (201, 400), resp.read() resp.close()