This is an automated email from the ASF dual-hosted git repository.
samt 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 27b3579 Add port to seed provider information in test yaml
27b3579 is described below
commit 27b35799a46dd5b649c4a172f4f8316b48615304
Author: Joseph Lynch <[email protected]>
AuthorDate: Thu Jan 31 10:37:41 2019 -0800
Add port to seed provider information in test yaml
Patch by Joseph Lynch; reviewed by Sam Tunnicliffe for CASSANDRA-14956
---
test/conf/cassandra-murmur.yaml | 2 +-
test/unit/org/apache/cassandra/cql3/PagingTest.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/test/conf/cassandra-murmur.yaml b/test/conf/cassandra-murmur.yaml
index a8288d0..92dc2e0 100644
--- a/test/conf/cassandra-murmur.yaml
+++ b/test/conf/cassandra-murmur.yaml
@@ -24,7 +24,7 @@ disk_access_mode: mmap
seed_provider:
- class_name: org.apache.cassandra.locator.SimpleSeedProvider
parameters:
- - seeds: "127.0.0.1"
+ - seeds: "127.0.0.1:7010"
endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
dynamic_snitch: true
server_encryption_options:
diff --git a/test/unit/org/apache/cassandra/cql3/PagingTest.java
b/test/unit/org/apache/cassandra/cql3/PagingTest.java
index 50bba0e..39bfbb1 100644
--- a/test/unit/org/apache/cassandra/cql3/PagingTest.java
+++ b/test/unit/org/apache/cassandra/cql3/PagingTest.java
@@ -17,9 +17,7 @@
*/
package org.apache.cassandra.cql3;
-import java.net.InetAddress;
import java.util.Iterator;
-import java.util.List;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -33,7 +31,6 @@ import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.Statement;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.dht.Murmur3Partitioner.LongToken;
import org.apache.cassandra.locator.*;
import org.apache.cassandra.service.EmbeddedCassandraService;
@@ -48,6 +45,7 @@ public class PagingTest
{
private static Cluster cluster;
private static Session session;
+ private static EmbeddedCassandraService cassandra;
private static final String KEYSPACE = "paging_test";
private static final String createKsStatement = "CREATE KEYSPACE " +
KEYSPACE +
@@ -59,7 +57,7 @@ public class PagingTest
public static void setup() throws Exception
{
System.setProperty("cassandra.config", "cassandra-murmur.yaml");
- EmbeddedCassandraService cassandra = new EmbeddedCassandraService();
+ cassandra = new EmbeddedCassandraService();
cassandra.start();
// Currently the native server start method return before the server
is fully binded to the socket, so we need
@@ -79,6 +77,7 @@ public class PagingTest
public static void tearDown()
{
cluster.close();
+ cassandra.stop();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]