You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jo...@apache.org on 2022/01/06 21:42:59 UTC
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 78f50573ad9238c34c7779a8dc33967d65944964
Merge: 05b0eae 071ecb5
Author: Jon Meredith <jo...@apache.org>
AuthorDate: Thu Jan 6 14:30:31 2022 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../db/compaction/CompactionExecutorTest.java | 32 +++++++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
index 2f8b5b2,b1f29b3..918d58c
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
@@@ -25,7 -24,7 +24,8 @@@ import org.junit.After
import org.junit.Before;
import org.junit.Test;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
+import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.utils.concurrent.SimpleCondition;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@@ -54,8 -58,9 +59,10 @@@ public class CompactionExecutorTes
@Before
public void setup()
{
+ DatabaseDescriptor.daemonInitialization();
executor = new TestTaskExecutor();
+ testTaskThrowable = null;
+ afterExecuteCompleted = new SimpleCondition();
}
@After
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org