Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-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 95B46101B4 for ; Thu, 13 Mar 2014 01:39:36 +0000 (UTC) Received: (qmail 51987 invoked by uid 500); 13 Mar 2014 01:39:36 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 51927 invoked by uid 500); 13 Mar 2014 01:39:35 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 51919 invoked by uid 99); 13 Mar 2014 01:39:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 01:39:35 +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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 01:39:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8D6E823889E1; Thu, 13 Mar 2014 01:39:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1577019 - in /zookeeper/trunk: CHANGES.txt src/c/tests/TestClient.cc Date: Thu, 13 Mar 2014 01:39:14 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140313013914.8D6E823889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Thu Mar 13 01:39:14 2014 New Revision: 1577019 URL: http://svn.apache.org/r1577019 Log: Revert "ZOOKEEPER-1883. C client unit test failures (Raul Gutierrez Segales via michim)" Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/c/tests/TestClient.cc Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1577019&r1=1577018&r2=1577019&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Thu Mar 13 01:39:14 2014 @@ -570,9 +570,6 @@ BUGFIXES: ZOOKEEPER-1662. Fix to two small bugs in ReconfigTest.testPortChange() (Alexander Shraer via michim) - ZOOKEEPER-1883. C client unit test failures (Raul Gutierrez Segales via - michim) - IMPROVEMENTS: ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports, Modified: zookeeper/trunk/src/c/tests/TestClient.cc URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/tests/TestClient.cc?rev=1577019&r1=1577018&r2=1577019&view=diff ============================================================================== --- zookeeper/trunk/src/c/tests/TestClient.cc (original) +++ zookeeper/trunk/src/c/tests/TestClient.cc Thu Mar 13 01:39:14 2014 @@ -1259,8 +1259,8 @@ public: const int timeout = 5000; int rc; watchctx_t ctx1, ctx2; - zhandle_t *zk1 = createClient(&ctx1); - zhandle_t *zk2 = createClient(&ctx2); + zhandle_t *zk1 = zookeeper_init(hostPorts, NULL, timeout, 0, &ctx1, 0); + zhandle_t *zk2 = zookeeper_init(hostPorts, NULL, timeout, 0, &ctx2, 0); CPPUNIT_ASSERT(zk1); CPPUNIT_ASSERT(zk2);