Author: jbellis
Date: Mon May 17 14:52:34 2010
New Revision: 945190
URL: http://svn.apache.org/viewvc?rev=945190&view=rev
Log:
block for AES to clear before we teardown the token metadata for the next test.
patch by Stu Hood; reviewed by jbellis for CASSANDRA-1028
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java?rev=945190&r1=945189&r2=945190&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
Mon May 17 14:52:34 2010
@@ -41,6 +41,7 @@ import org.apache.cassandra.CleanupHelpe
import org.apache.cassandra.config.DatabaseDescriptorTest;
import org.apache.cassandra.Util;
+import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -77,6 +78,16 @@ public class AntiEntropyServiceTest exte
assert tmd.isMember(REMOTE);
}
+ @After
+ public void teardown() throws Exception
+ {
+ // block for AES to clear before we teardown the token metadata for
the next test.
+ StageManager.getStage(StageManager.AE_SERVICE_STAGE).submit(new
Runnable()
+ {
+ public void run() { /* no-op */ }
+ }).get();
+ }
+
@Test
public void testInstance() throws Throwable
{
