Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 40998 invoked from network); 22 May 2009 07:25:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 May 2009 07:25:31 -0000 Received: (qmail 83876 invoked by uid 500); 22 May 2009 07:25:44 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 83847 invoked by uid 500); 22 May 2009 07:25:44 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 83837 invoked by uid 99); 22 May 2009 07:25:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 May 2009 07:25:43 +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; Fri, 22 May 2009 07:25:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A00E4238886C; Fri, 22 May 2009 07:25:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r777413 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/tests/TestClient.cc Date: Fri, 22 May 2009 07:25:21 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090522072521.A00E4238886C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Fri May 22 07:25:21 2009 New Revision: 777413 URL: http://svn.apache.org/viewvc?rev=777413&view=rev Log: ZOOKEEPER-415. zookeeper c tests hang. Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/tests/TestClient.cc Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=777413&r1=777412&r2=777413&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Fri May 22 07:25:21 2009 @@ -92,6 +92,8 @@ ZOOKEEPER-402. zookeeper c library segfaults on data for a node in zookeeper being null. (mahadev via phunt) + ZOOKEEPER-415. zookeeper c tests hang. (mahadev via phunt) + IMPROVEMENTS: ZOOKEEPER-308. improve the atomic broadcast performance 3x. (breed via mahadev) Modified: hadoop/zookeeper/trunk/src/c/tests/TestClient.cc URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/tests/TestClient.cc?rev=777413&r1=777412&r2=777413&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/tests/TestClient.cc (original) +++ hadoop/zookeeper/trunk/src/c/tests/TestClient.cc Fri May 22 07:25:21 2009 @@ -116,6 +116,7 @@ evt_t getEvent() { evt_t evt; mutex.acquire(); + CPPUNIT_ASSERT( events.size() > 0); evt = events.front(); events.pop_front(); mutex.release(); @@ -602,11 +603,13 @@ CPPUNIT_ASSERT_EQUAL_MESSAGE(evt.path, ZOO_CHANGED_EVENT, evt.type); CPPUNIT_ASSERT_EQUAL(string("/watchtest/child"), evt.path); + CPPUNIT_ASSERT_MESSAGE(testName, waitForEvent(zk, ctxLocal, 5)); // The create will trigget the get children and the // exists watches evt = ctxLocal->getEvent(); CPPUNIT_ASSERT_EQUAL_MESSAGE(evt.path, ZOO_CREATED_EVENT, evt.type); CPPUNIT_ASSERT_EQUAL(string("/watchtest/child2"), evt.path); + CPPUNIT_ASSERT_MESSAGE(testName, waitForEvent(zk, ctxLocal, 5)); evt = ctxLocal->getEvent(); CPPUNIT_ASSERT_EQUAL_MESSAGE(evt.path, ZOO_CHILD_EVENT, evt.type); CPPUNIT_ASSERT_EQUAL(string("/watchtest"), evt.path); @@ -653,7 +656,8 @@ evt = ctxLocal->getEvent(); CPPUNIT_ASSERT_EQUAL_MESSAGE(evt.path, ZOO_DELETED_EVENT, evt.type); CPPUNIT_ASSERT_EQUAL(string("/watchtest/child2"), evt.path); - + + CPPUNIT_ASSERT_MESSAGE(testName, waitForEvent(zk, ctxLocal, 5)); evt = ctxLocal->getEvent(); CPPUNIT_ASSERT_EQUAL_MESSAGE(evt.path, ZOO_CHILD_EVENT, evt.type); CPPUNIT_ASSERT_EQUAL(string("/watchtest"), evt.path);