Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 22668 invoked from network); 14 Jul 2010 21:14:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Jul 2010 21:14:38 -0000 Received: (qmail 62341 invoked by uid 500); 14 Jul 2010 21:14:38 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 62312 invoked by uid 500); 14 Jul 2010 21:14:37 -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 62305 invoked by uid 99); 14 Jul 2010 21:14:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jul 2010 21:14:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jul 2010 21:14:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 658A22388980; Wed, 14 Jul 2010 21:13:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964202 - /couchdb/branches/1.0.x/test/etap/031-doc-to-json.t Date: Wed, 14 Jul 2010 21:13:42 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100714211342.658A22388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Wed Jul 14 21:13:42 2010 New Revision: 964202 URL: http://svn.apache.org/viewvc?rev=964202&view=rev Log: Merged revision 964201 from trunk: Adapt test to change introduced in revision 963725 - deleted documents can now have non-empty bodies. Modified: couchdb/branches/1.0.x/test/etap/031-doc-to-json.t Modified: couchdb/branches/1.0.x/test/etap/031-doc-to-json.t URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/031-doc-to-json.t?rev=964202&r1=964201&r2=964202&view=diff ============================================================================== --- couchdb/branches/1.0.x/test/etap/031-doc-to-json.t (original) +++ couchdb/branches/1.0.x/test/etap/031-doc-to-json.t Wed Jul 14 21:13:42 2010 @@ -78,8 +78,8 @@ test_to_json_success() -> }, { #doc{deleted=true, body={[{<<"foo">>, <<"bar">>}]}}, - {[{<<"_id">>, <<>>}, {<<"_deleted">>, true}]}, - "Deleted docs drop body members." + {[{<<"_id">>, <<>>}, {<<"foo">>, <<"bar">>}, {<<"_deleted">>, true}]}, + "Deleted docs no longer drop body members." }, { #doc{meta=[