[cassandra] branch trunk updated: Fix BootstrapTest failure on vnodes

[jm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jmckenzie pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 0bde8a2e20 Fix BootstrapTest failure on vnodes
0bde8a2e20 is described below

commit 0bde8a2e20ebf66d11dc91c7de09cd66a3e603f7
Author: Josh McKenzie <jm...@apache.org>
AuthorDate: Wed Nov 2 13:19:14 2022 -0400

    Fix BootstrapTest failure on vnodes
    
    Patch by Josh McKenzie; reviewed by David Capwell for CASSANDRA-17679
---
 .../org/apache/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"))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org