You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/03/17 07:13:03 UTC
svn commit: r1735369 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java
src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java
Author: phunt
Date: Thu Mar 17 06:13:02 2016
New Revision: 1735369
URL: http://svn.apache.org/viewvc?rev=1735369&view=rev
Log:
ZOOKEEPER-2388 Unit tests failing on Solaris (Arshad Mohammad via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1735369&r1=1735368&r2=1735369&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Mar 17 06:13:02 2016
@@ -284,6 +284,8 @@ BUGFIXES:
ZOOKEEPER-2385 Zookeeper trunk build is failing on windows
(Arshad Mohammad via phunt)
+ ZOOKEEPER-2388 Unit tests failing on Solaris (Arshad Mohammad via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java?rev=1735369&r1=1735368&r2=1735369&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LocalPeerBeanTest.java Thu Mar 17 06:13:02 2016
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTru
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.server.ServerCnxnFactory;
import org.junit.Test;
@@ -49,7 +50,7 @@ public class LocalPeerBeanTest {
* Case 2: When only client port is configured
*/
ServerCnxnFactory cnxnFactory = ServerCnxnFactory.createFactory();
- int clientPort = 2181;
+ int clientPort = PortAssignment.unique();
InetSocketAddress address = new InetSocketAddress(clientPort);
cnxnFactory.configure(address, 5, false);
quorumPeer.setCnxnFactory(cnxnFactory);
@@ -64,15 +65,15 @@ public class LocalPeerBeanTest {
/**
* Case 3: When both client port and client address is configured
*/
- InetAddress clientIP = InetAddress.getByAddress(new byte[] { 127, 0, 0,
- 2 });
+ clientPort = PortAssignment.unique();
+ InetAddress clientIP = InetAddress.getLoopbackAddress();
address = new InetSocketAddress(clientIP, clientPort);
cnxnFactory = ServerCnxnFactory.createFactory();
cnxnFactory.configure(address, 5, false);
quorumPeer.setCnxnFactory(cnxnFactory);
result = remotePeerBean.getClientAddress();
- String expectedResult = "127.0.0.2:" + clientPort;
+ String expectedResult = clientIP.getHostAddress() + ":" + clientPort;
assertEquals(expectedResult, result);
// cleanup
cnxnFactory.shutdown();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java?rev=1735369&r1=1735368&r2=1735369&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTest.java Thu Mar 17 06:13:02 2016
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
@@ -47,12 +48,12 @@ public class QuorumPeerTest {
long myId = 1;
File dataDir = ClientBase.createTmpDir();
int clientPort = PortAssignment.unique();
- String clientIP = "127.0.0.2";
Map<Long, QuorumServer> peersView = new HashMap<Long, QuorumServer>();
+ InetAddress clientIP = InetAddress.getLoopbackAddress();
peersView.put(Long.valueOf(myId),
- new QuorumServer(myId, new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
- new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+ new QuorumServer(myId, new InetSocketAddress(clientIP, PortAssignment.unique()),
+ new InetSocketAddress(clientIP, PortAssignment.unique()),
new InetSocketAddress(clientIP, clientPort), LearnerType.PARTICIPANT));
/**
@@ -61,7 +62,7 @@ public class QuorumPeerTest {
QuorumPeer peer1 = new QuorumPeer(peersView, dataDir, dataDir, clientPort, electionAlg, myId, tickTime,
initLimit, syncLimit);
String hostString1 = peer1.cnxnFactory.getLocalAddress().getHostString();
- assertEquals(clientIP, hostString1);
+ assertEquals(clientIP.getHostAddress(), hostString1);
// cleanup
peer1.shutdown();
@@ -71,15 +72,14 @@ public class QuorumPeerTest {
*/
peersView.clear();
clientPort = PortAssignment.unique();
- clientIP = "127.0.0.3";
peersView.put(Long.valueOf(myId),
- new QuorumServer(myId, new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
- new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+ new QuorumServer(myId, new InetSocketAddress(clientIP, PortAssignment.unique()),
+ new InetSocketAddress(clientIP, PortAssignment.unique()),
new InetSocketAddress(clientIP, clientPort), LearnerType.PARTICIPANT));
QuorumPeer peer2 = new QuorumPeer(peersView, dataDir, dataDir, clientPort, electionAlg, myId, tickTime,
initLimit, syncLimit);
String hostString2 = peer2.cnxnFactory.getLocalAddress().getHostString();
- assertEquals(clientIP, hostString2);
+ assertEquals(clientIP.getHostAddress(), hostString2);
// cleanup
peer2.shutdown();
}