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 AD9A18450 for ; Mon, 15 Aug 2011 00:39:33 +0000 (UTC) Received: (qmail 81537 invoked by uid 500); 15 Aug 2011 00:39:33 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 81519 invoked by uid 500); 15 Aug 2011 00:39:32 -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 81511 invoked by uid 99); 15 Aug 2011 00:39:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Aug 2011 00:39:32 +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; Mon, 15 Aug 2011 00:39:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5AA94238889B for ; Mon, 15 Aug 2011 00:39:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157686 - in /zookeeper/trunk: CHANGES.txt src/contrib/zkpython/src/test/connection_test.py src/contrib/zkpython/src/test/zktestbase.py Date: Mon, 15 Aug 2011 00:39:12 -0000 To: commits@zookeeper.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110815003912.5AA94238889B@eris.apache.org> Author: mahadev Date: Mon Aug 15 00:39:11 2011 New Revision: 1157686 URL: http://svn.apache.org/viewvc?rev=1157686&view=rev Log: ZOOKEEPER-1141. zkpython fails tests under python 2.4. (phunt via mahadev) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/contrib/zkpython/src/test/connection_test.py zookeeper/trunk/src/contrib/zkpython/src/test/zktestbase.py Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1157686&r1=1157685&r2=1157686&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Mon Aug 15 00:39:11 2011 @@ -288,6 +288,8 @@ BUGFIXES: ZOOKEEPER-1055. check for duplicate ACLs in addACL() and create(). (Eugene Koontz via mahadev) + ZOOKEEPER-1141. zkpython fails tests under python 2.4. (phunt via mahadev) + IMPROVEMENTS: ZOOKEEPER-724. Improve junit test integration - log harness information (phunt via mahadev) Modified: zookeeper/trunk/src/contrib/zkpython/src/test/connection_test.py URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/src/test/connection_test.py?rev=1157686&r1=1157685&r2=1157686&view=diff ============================================================================== --- zookeeper/trunk/src/contrib/zkpython/src/test/connection_test.py (original) +++ zookeeper/trunk/src/contrib/zkpython/src/test/connection_test.py Mon Aug 15 00:39:11 2011 @@ -76,7 +76,7 @@ class ConnectionTest(zktestbase.TestBase cv.wait(15.0) cv.release() self.assertEqual(self.connected, True, "Connection timed out to " + self.host) - self.assertEqual(True, all( [ zookeeper.state(handle) == zookeeper.CONNECTED_STATE for handle in handles ] ), + self.assertEqual(True, self.all( [ zookeeper.state(handle) == zookeeper.CONNECTED_STATE for handle in handles ] ), "Not all connections succeeded") oldhandle = handles[3] zookeeper.close(oldhandle) @@ -115,7 +115,7 @@ class ConnectionTest(zktestbase.TestBase path = "/zkpython-test-handles-%s" % str(i) self.assertEqual(path, zookeeper.create(h, path, "", [ZOO_OPEN_ACL_UNSAFE], zookeeper.EPHEMERAL)) - self.assertEqual(True, all( zookeeper.close(h) == zookeeper.OK for h in handles )) + self.assertEqual(True, self.all( zookeeper.close(h) == zookeeper.OK for h in handles )) def testversionstringexists(self): self.assertTrue(hasattr(zookeeper, '__version__')) Modified: zookeeper/trunk/src/contrib/zkpython/src/test/zktestbase.py URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/src/test/zktestbase.py?rev=1157686&r1=1157685&r2=1157686&view=diff ============================================================================== --- zookeeper/trunk/src/contrib/zkpython/src/test/zktestbase.py (original) +++ zookeeper/trunk/src/contrib/zkpython/src/test/zktestbase.py Mon Aug 15 00:39:11 2011 @@ -93,3 +93,9 @@ class TestBase(unittest.TestCase): def tearDown(self): if self.connected: zookeeper.close(self.handle) + + def all(self, iterable): + for element in iterable: + if not element: + return False + return True