You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2012/09/03 07:56:42 UTC
svn commit: r1380130 - in /zookeeper/trunk: ./
src/java/main/org/apache/zookeeper/ src/java/test/org/apache/zookeeper/test/
Author: mahadev
Date: Mon Sep 3 05:56:41 2012
New Revision: 1380130
URL: http://svn.apache.org/viewvc?rev=1380130&view=rev
Log:
ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest' and not identifying misfunctions. (Rakesh R via mahadev)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETestUtils.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1380130&r1=1380129&r2=1380130&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Sep 3 05:56:41 2012
@@ -231,6 +231,9 @@ BUGFIXES:
ZOOKEEPER-1481 allow the C cli to run exists with a watcher (phunt via michim)
+ ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest'
+ and not identifying misfunctions. (Rakesh R via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java?rev=1380130&r1=1380129&r2=1380130&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java Mon Sep 3 05:56:41 2012
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
*
*/
public class Environment {
- public static String JAAS_CONF_KEY = "java.security.auth.login.config";
+ public static final String JAAS_CONF_KEY = "java.security.auth.login.config";
public static class Entry {
private String k;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java?rev=1380130&r1=1380129&r2=1380130&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEBackwardElectionRoundTest.java Mon Sep 3 05:56:41 2012
@@ -134,6 +134,9 @@ public class FLEBackwardElectionRoundTes
* Run another instance of leader election.
*/
thread.join(5000);
+ Assert.assertTrue("State is not leading. Current state:"
+ + peer.getPeerState(),
+ peer.getPeerState() == ServerState.LEADING);
thread = new FLETestUtils.LEThread(peer, 0);
thread.start();
@@ -145,7 +148,9 @@ public class FLEBackwardElectionRoundTes
thread.join(5000);
-
+ Assert.assertTrue("State is not looking. Current state:"
+ + peer.getPeerState(),
+ peer.getPeerState() == ServerState.LOOKING);
if (!thread.isAlive()) {
Assert.fail("Should not have joined");
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java?rev=1380130&r1=1380129&r2=1380130&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java Mon Sep 3 05:56:41 2012
@@ -91,6 +91,9 @@ public class FLELostMessageTest extends
*/
mockServer();
thread.join(5000);
+ Assert.assertTrue("State is not leading. Current state:"
+ + peer.getPeerState(),
+ peer.getPeerState() == ServerState.LEADING);
if (thread.isAlive()) {
Assert.fail("Threads didn't join");
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETestUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETestUtils.java?rev=1380130&r1=1380129&r2=1380130&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETestUtils.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETestUtils.java Mon Sep 3 05:56:41 2012
@@ -65,8 +65,7 @@ public class FLETestUtils {
peer.setCurrentVote(v);
LOG.info("Finished election: " + i + ", " + v.getId());
-
- Assert.assertTrue("State is not leading.", peer.getPeerState() == ServerState.LEADING);
+ LOG.info("QuorumPeer state: " + peer.getPeerState());
} catch (Exception e) {
e.printStackTrace();
}