You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/08/23 19:12:03 UTC
svn commit: r1697227 - in /zookeeper/trunk: CHANGES.txt
src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
Author: rgs
Date: Sun Aug 23 17:12:03 2015
New Revision: 1697227
URL: http://svn.apache.org/r1697227
Log:
ZOOKEEPER-2245: SimpleSysTest test cases fails
(Arshad Mohammad via rgs)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1697227&r1=1697226&r2=1697227&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Aug 23 17:12:03 2015
@@ -154,6 +154,9 @@ BUGFIXES:
ZOOKEEPER-2239: JMX State from LocalPeerBean incorrect
(Kevin Lee via rgs)
+ ZOOKEEPER-2245: SimpleSysTest test cases fails
+ (Arshad Mohammad via rgs)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java?rev=1697227&r1=1697226&r2=1697227&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java Sun Aug 23 17:12:03 2015
@@ -61,7 +61,9 @@ public class BaseSysTest {
}
@After
public void tearDown() throws Exception {
- im.close();
+ if (null != im) {
+ im.close();
+ }
}
int serverCount = defaultServerCount;
@@ -148,10 +150,17 @@ public class BaseSysTest {
qps = new QuorumPeer[count];
qpsDirs = new File[count];
for(int i = 1; i <= count; i++) {
- peers.put(Long.valueOf(i), new QuorumServer(i, new InetSocketAddress("127.0.0.1", fakeBasePort + i)));
+ InetSocketAddress peerAddress = new InetSocketAddress("127.0.0.1",
+ fakeBasePort + i);
+ InetSocketAddress electionAddr = new InetSocketAddress("127.0.0.1",
+ serverCount + fakeBasePort + i);
+ peers.put(Long.valueOf(i), new QuorumServer(i, peerAddress,
+ electionAddr));
}
StringBuilder sb = new StringBuilder();
for(int i = 0; i < count; i++) {
+ //make that testData exists otherwise it fails on windows
+ testData.mkdirs();
qpsDirs[i] = File.createTempFile("sysTest", ".tmp", testData);
qpsDirs[i].delete();
qpsDirs[i].mkdir();
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java?rev=1697227&r1=1697226&r2=1697227&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java Sun Aug 23 17:12:03 2015
@@ -51,7 +51,9 @@ public class SimpleClient implements Ins
try {
zk = new ZooKeeper(hostPort, 15000, this);
zk.getData("/simpleCase", true, this, null);
- r.report("Client " + index + " connecting to " + hostPort);
+ if (null != r) {
+ r.report("Client " + index + " connecting to " + hostPort);
+ }
} catch (Exception e) {
e.printStackTrace();
}