From commits-return-22796-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Sat Apr 4 23:29:03 2015 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 9193917D64 for ; Sat, 4 Apr 2015 23:29:03 +0000 (UTC) Received: (qmail 47036 invoked by uid 500); 4 Apr 2015 23:28:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 46949 invoked by uid 500); 4 Apr 2015 23:28:58 -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 44784 invoked by uid 99); 4 Apr 2015 23:28:57 -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, 04 Apr 2015 23:28:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4227E2F84; Sat, 4 Apr 2015 23:28:56 +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 Date: Sat, 04 Apr 2015 23:29:41 -0000 Message-Id: <3690765669cc42aa9dc00fa6cd5bc799@git.apache.org> In-Reply-To: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> References: <7e6f3f454a6141008e620dd6cb309fa6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/48] couch commit: updated refs/heads/master to 7776921 Disable some tests Disabled tests fail sometimes due to timeout and race conditions COUCHDB-2547 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/15db2b4e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/15db2b4e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/15db2b4e Branch: refs/heads/master Commit: 15db2b4ed67a7926b79a367bd8cff81e4165cdd0 Parents: 17937d5 Author: ILYA Khlopotov Authored: Thu Feb 26 15:19:45 2015 -0800 Committer: ILYA Khlopotov Committed: Thu Feb 26 15:19:45 2015 -0800 ---------------------------------------------------------------------- test/couch_changes_tests.erl | 4 ++++ test/couchdb_compaction_daemon.erl | 3 +++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/15db2b4e/test/couch_changes_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_changes_tests.erl b/test/couch_changes_tests.erl index 589cccc..c28394b 100644 --- a/test/couch_changes_tests.erl +++ b/test/couch_changes_tests.erl @@ -18,6 +18,8 @@ -define(TIMEOUT, 3000). -define(TEST_TIMEOUT, 10000). +-ifdef(run_broken_tests). + -record(row, { id, seq, @@ -600,3 +602,5 @@ create_db(DbName) -> delete_db(DbName) -> ok = couch_server:delete(DbName, [?ADMIN_CTX]). + +-endif. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/15db2b4e/test/couchdb_compaction_daemon.erl ---------------------------------------------------------------------- diff --git a/test/couchdb_compaction_daemon.erl b/test/couchdb_compaction_daemon.erl index 92ed8ac..0598a5a 100644 --- a/test/couchdb_compaction_daemon.erl +++ b/test/couchdb_compaction_daemon.erl @@ -18,6 +18,7 @@ -define(TIMEOUT, 30000). -define(TIMEOUT_S, ?TIMEOUT div 1000). +-ifdef(run_broken_tests). start() -> Ctx = test_util:start_couch(), @@ -256,3 +257,5 @@ with_config_change(DbName, Fun) -> true -> wait end end). + +-endif.