You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ra...@apache.org on 2015/09/17 09:12:01 UTC
svn commit: r1703504 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
Author: rakeshr
Date: Thu Sep 17 07:12:00 2015
New Revision: 1703504
URL: http://svn.apache.org/r1703504
Log:
ZOOKEEPER-2245: SimpleSysTest test cases fails (Arshad Mohammad via rakeshr)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1703504&r1=1703503&r2=1703504&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Sep 17 07:12:00 2015
@@ -150,6 +150,8 @@ IMPROVEMENTS:
ZOOKEEPER-2040: Server to log underlying cause of SASL connection problems.
(Steve Loughran via cnauroth)
+ ZOOKEEPER-2245: SimpleSysTest test cases fails (Arshad Mohammad via rakeshr)
+
NEW FEATURES:
ZOOKEEPER-2237 Port async multi to 3.4 branch (Ivan Kelly via rakeshr)
Modified: zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java?rev=1703504&r1=1703503&r2=1703504&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java (original)
+++ zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java Thu Sep 17 07:12:00 2015
@@ -61,7 +61,9 @@ public class BaseSysTest extends TestCas
}
@Override
protected void tearDown() throws Exception {
- im.close();
+ if (null != im) {
+ im.close();
+ }
}
int serverCount = defaultServerCount;
@@ -147,10 +149,17 @@ public class BaseSysTest extends TestCas
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/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java?rev=1703504&r1=1703503&r2=1703504&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java (original)
+++ zookeeper/branches/branch-3.4/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java Thu Sep 17 07:12:00 2015
@@ -53,7 +53,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();
}