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);
|