use new docker image and don't test functions

shotover · Feb 8, 2024 · 749294a · 749294a
1 parent 7409c6a
commit 749294a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/shotover-proxy/tests/cassandra_int_tests/mod.rs b/shotover-proxy/tests/cassandra_int_tests/mod.rs
@@ -53,7 +53,7 @@ where
     udt::test(&connection).await;
     native_types::test(&connection).await;
     collections::test(&connection, driver).await;
-    // functions::test(&connection).await;
+    functions::test(&connection).await;
     prepared_statements_simple::test(&connection, connection_creator, 1).await;
     prepared_statements_all::test(&connection, 1).await;
     batch_statements::test(&connection).await;
@@ -1021,9 +1021,19 @@ async fn cassandra_5(#[case] driver: CassandraDriver) {
         .start()
         .await;
 
-    let connection = || CassandraConnectionBuilder::new("127.0.0.1", 9042, driver).build();
+    let connection_creator = || CassandraConnectionBuilder::new("127.0.0.1", 9042, driver).build();
 
-    standard_test_suite(&connection, driver).await;
+    let connection = connection_creator().await;
+
+    keyspace::test(&connection).await;
+    table::test(&connection).await;
+    udt::test(&connection).await;
+    native_types::test(&connection).await;
+    collections::test(&connection, driver).await;
+    prepared_statements_simple::test(&connection, connection_creator, 1).await;
+    prepared_statements_all::test(&connection, 1).await;
+    batch_statements::test(&connection).await;
+    timestamp::test(&connection).await;
 
     shotover.shutdown_and_then_consume_events(&[]).await;
 }
diff --git a/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml b/shotover-proxy/tests/test-configs/cassandra/cassandra-5/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   cassandra-one:
-    image: cassandra:5.0
+    image: shotover/cassandra-test:5.0-beta1-r2
     ports:
       - "9043:9042"
     environment:

diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
@@ -27,7 +27,7 @@ pub fn new_moto() -> DockerCompose {
     docker_compose("tests/transforms/docker-compose-moto.yaml")
 }
 
-pub static IMAGE_WAITERS: [Image; 12] = [
+pub static IMAGE_WAITERS: [Image; 11] = [
     Image {
         name: "motoserver/moto",
         log_regex_to_wait_for: r"Press CTRL\+C to quit",
@@ -81,7 +81,7 @@ pub static IMAGE_WAITERS: [Image; 12] = [
         timeout: Duration::from_secs(120),
     },
     Image {
-        name: "cassandra:5.0",
+        name: "shotover/cassandra-test:5.0-beta1-r2",
         log_regex_to_wait_for: r"Starting listening for CQL clients",
         timeout: Duration::from_secs(120),
     },