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 <[email protected]> Authored: Thu Apr 9 20:25:03 2015 +0300 Committer: Alexander Shorin <[email protected]> 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()
