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 698E89F93 for ; Tue, 22 Nov 2011 16:52:03 +0000 (UTC) Received: (qmail 41574 invoked by uid 500); 22 Nov 2011 16:52:03 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 41484 invoked by uid 500); 22 Nov 2011 16:52:02 -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 41477 invoked by uid 99); 22 Nov 2011 16:52:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Nov 2011 16:52:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Nov 2011 16:51:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5A5F25507F; Tue, 22 Nov 2011 16:51:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Add more tests to 074-doc-update-conflicts.t Message-Id: <20111122165138.5A5F25507F@tyr.zones.apache.org> Date: Tue, 22 Nov 2011 16:51:38 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 9292f8dd1 -> 82441c123 Add more tests to 074-doc-update-conflicts.t Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/82441c12 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/82441c12 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/82441c12 Branch: refs/heads/master Commit: 82441c1231b755946011c3188e3c383bf0f39af5 Parents: 9292f8d Author: Filipe David Borba Manana Authored: Tue Nov 22 14:22:31 2011 +0000 Committer: Filipe David Borba Manana Committed: Tue Nov 22 14:23:46 2011 +0000 ---------------------------------------------------------------------- test/etap/074-doc-update-conflicts.t | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/82441c12/test/etap/074-doc-update-conflicts.t ---------------------------------------------------------------------- diff --git a/test/etap/074-doc-update-conflicts.t b/test/etap/074-doc-update-conflicts.t index 7a1d820..d1be3ae 100755 --- a/test/etap/074-doc-update-conflicts.t +++ b/test/etap/074-doc-update-conflicts.t @@ -26,7 +26,7 @@ test_db_name() -> <<"couch_test_update_conflicts">>. main(_) -> test_util:init_code_path(), - etap:plan(10), + etap:plan(15), case (catch test()) of ok -> etap:end_tests(); @@ -39,6 +39,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_config:set("couchdb", "delayed_commits", "true", false), lists:foreach( fun(NumClients) -> test_concurrent_doc_update(NumClients) end, @@ -103,6 +104,7 @@ test_concurrent_doc_update(NumClients) -> NumConflicts, NumClients - 1, "Got " ++ ?i2l(NumClients - 1) ++ " client conflicts"), + {ok, Db2} = couch_db:open_int(test_db_name(), []), {ok, Doc2} = couch_db:open_doc(Db2, <<"foobar">>, []), ok = couch_db:close(Db2), @@ -112,7 +114,18 @@ test_concurrent_doc_update(NumClients) -> SavedValue, "Persisted doc has the right value"), - delete_db(Db). + ok = timer:sleep(1000), + etap:diag("Restarting the server"), + couch_server_sup:stop(), + ok = timer:sleep(1000), + couch_server_sup:start_link(test_util:config_files()), + + {ok, Db3} = couch_db:open_int(test_db_name(), []), + {ok, Doc3} = couch_db:open_doc(Db3, <<"foobar">>, []), + ok = couch_db:close(Db3), + etap:is(Doc3, Doc2, "Got same document after server restart"), + + delete_db(Db3). spawn_client(Doc) ->