This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 31a3ff17680c5a41e2ba859c398e405099ea4f1b
Author: Marcus Eriksson <marc...@apache.org>
AuthorDate: Mon Nov 27 08:00:01 2023 +0100
Test failure: org.apache.cassandra.db.RepairedDataInfoTest
Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-19059
---
test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java | 1 -
test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java | 1 -
.../apache/cassandra/db/lifecycle/LifecycleTransactionTest.java | 7 -------
.../unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java | 7 -------
test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 1 -
test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java | 1 -
6 files changed, 18 deletions(-)
diff --git a/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java
b/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java
index 43eebd19c1..11a507d083 100644
--- a/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java
+++ b/test/unit/org/apache/cassandra/db/RepairedDataInfoTest.java
@@ -69,7 +69,6 @@ public class RepairedDataInfoTest
{
ServerTestUtils.prepareServerNoRegister();
CommitLog.instance.start();
- MockSchema.cleanup();
String ks = "repaired_data_info_test";
cfs = MockSchema.newCFS(ks, metadata -> metadata.addStaticColumn("s",
UTF8Type.instance));
metadata = cfs.metadata();
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
index 6f72c21334..53efbc6f24 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
@@ -51,7 +51,6 @@ public class HelpersTest
{
ServerTestUtils.prepareServerNoRegister();
CommitLog.instance.start();
- MockSchema.cleanup();
}
static Set<Integer> a = set(1, 2, 3);
diff --git
a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java
index 8f197c1072..fb3cccace2 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -54,12 +53,6 @@ public class LifecycleTransactionTest extends
AbstractTransactionalTest
{
private boolean incrementalBackups;
- @BeforeClass
- public static void setUp()
- {
- MockSchema.cleanup();
- }
-
@Before
public void disableIncrementalBackup()
{
diff --git
a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
index 710c869fab..c8fbc936ce 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
@@ -37,7 +37,6 @@ import java.util.stream.Stream;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.Util;
@@ -81,12 +80,6 @@ public class LogTransactionTest extends
AbstractTransactionalTest
{
private static final String KEYSPACE = "TransactionLogsTest";
- @BeforeClass
- public static void setUp()
- {
- MockSchema.cleanup();
- }
-
protected AbstractTransactionalTest.TestableTransaction newTest() throws
Exception
{
LogTransaction.waitForDeletions();
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java
index c082ad40bb..96e041f3a7 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java
@@ -89,7 +89,6 @@ public class TrackerTest
{
ServerTestUtils.prepareServerNoRegister();
CommitLog.instance.start();
- MockSchema.cleanup();
}
@Test
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java
index 4dbb93ead1..a9710895b5 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java
@@ -55,7 +55,6 @@ public class ViewTest
{
ServerTestUtils.prepareServerNoRegister();
CommitLog.instance.start();
- MockSchema.cleanup();
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
