This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03041718023478f2713441f47e60900577da5584 Merge: fa7270dd7c 51a858ee22 Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Oct 22 09:42:27 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../repair/autorepair/AutoRepairConfig.java | 6 ++-- .../repair/autorepair/AutoRepairConfigTest.java | 40 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --cc test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java index 4dbdf24efb,ba12f73aec..1a50e01a0d --- a/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java +++ b/test/unit/org/apache/cassandra/repair/autorepair/AutoRepairConfigTest.java @@@ -522,5 -547,20 +560,7 @@@ public class AutoRepairConfigTest exten assertEquals(new DurationSpec.IntSecondsBound("5m"), config.global_settings.initial_scheduler_delay); assertEquals(new DurationSpec.IntSecondsBound("3h"), config.global_settings.repair_session_timeout); assertEquals(new DurationSpec.IntSecondsBound("24h"), config.global_settings.min_repair_interval); + assertEquals(Integer.valueOf(3), config.global_settings.repair_max_retries); + assertEquals(new DurationSpec.LongSecondsBound("30s"), config.global_settings.repair_retry_backoff); } - - @Test - public void testTokenRangeSplitterWrongTypeRejectedWithoutInitializing() - { - ClassLoadingTestSupport.assertNotInitialized(ClassLoadingTestNonAssignable.class); - - ParameterizedClass pc = new ParameterizedClass(ClassLoadingTestNonAssignable.class.getName(), Collections.emptyMap()); - assertThatThrownBy(() -> AutoRepairConfig.newAutoRepairTokenRangeSplitter(repairType, pc)) - .isInstanceOf(ConfigurationException.class) - .hasStackTraceContaining("must extend or implement " + IAutoRepairTokenRangeSplitter.class.getName()); - - assertThat(ClassLoadingTestSupport.wasInitialized(ClassLoadingTestNonAssignable.class)).isFalse(); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
