From 0bde8a2e20ebf66d11dc91c7de09cd66a3e603f7 Mon Sep 17 00:00:00 2001 From: Josh McKenzie Date: Wed, 2 Nov 2022 13:19:14 -0400 Subject: [PATCH] Fix BootstrapTest failure on vnodes Patch by Josh McKenzie; reviewed by David Capwell for CASSANDRA-17679 --- .../cassandra/distributed/test/ring/BootstrapTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java b/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java index b337f8db60..3d1c5a648e 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ring/BootstrapTest.java @@ -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"))