mirror of https://github.com/apache/cassandra
Fix BootstrapTest failure on vnodes
Patch by Josh McKenzie; reviewed by David Capwell for CASSANDRA-17679
This commit is contained in:
parent
9603d03938
commit
0bde8a2e20
|
|
@ -28,6 +28,7 @@ import java.util.stream.IntStream;
|
|||
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.AssumptionViolatedException;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
@ -196,6 +197,11 @@ public class BootstrapTest extends TestBaseImpl
|
|||
bootstrap()),
|
||||
newInstance.config().num());
|
||||
}
|
||||
catch (AssumptionViolatedException ave)
|
||||
{
|
||||
// We get an AssumptionViolatedException if we're in a test job configured w/vnodes
|
||||
throw ave;
|
||||
}
|
||||
catch (RuntimeException rte)
|
||||
{
|
||||
if (rte.getMessage().contains("Discovered existing bootstrap data"))
|
||||
|
|
|
|||
Loading…
Reference in New Issue