Merge branch 'main' into ssh_instructions

shotover · Mar 18, 2024 · 3847bd7 · 3847bd7
2 parents dc9152f + 6184549
commit 3847bd7
Show file tree

Hide file tree

Showing 2 changed files with 176 additions and 71 deletions.
diff --git a/shotover-proxy/tests/kafka_int_tests/mod.rs b/shotover-proxy/tests/kafka_int_tests/mod.rs
@@ -52,10 +52,9 @@ async fn passthrough_tls(#[case] driver: KafkaDriver) {
  .expect("Shotover did not shutdown within 10s");
 }
 
-#[cfg(feature = "rdkafka-driver-tests")] // temporarily needed to avoid a warning
 #[rstest]
 #[cfg_attr(feature = "rdkafka-driver-tests", case::cpp(KafkaDriver::Cpp))]
-// #[case::java(KafkaDriver::Java)]
+#[case::java(KafkaDriver::Java)]
 #[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
 async fn cluster_tls(#[case] driver: KafkaDriver) {
  test_helpers::cert::generate_kafka_test_certs();
@@ -133,10 +132,9 @@ async fn passthrough_sasl_encode(#[case] driver: KafkaDriver) {
  shotover.shutdown_and_then_consume_events(&[]).await;
 }
 
-#[cfg(feature = "rdkafka-driver-tests")] // temporarily needed to avoid a warning
 #[rstest]
 #[cfg_attr(feature = "rdkafka-driver-tests", case::cpp(KafkaDriver::Cpp))]
-// #[case::java(KafkaDriver::Java)]
+#[case::java(KafkaDriver::Java)]
 #[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
 async fn cluster_1_rack_single_shotover(#[case] driver: KafkaDriver) {
  let _docker_compose =
@@ -159,8 +157,8 @@ async fn cluster_1_rack_single_shotover(#[case] driver: KafkaDriver) {
 #[cfg(feature = "rdkafka-driver-tests")] // temporarily needed to avoid a warning
 #[rstest]
 #[cfg_attr(feature = "rdkafka-driver-tests", case::cpp(KafkaDriver::Cpp))]
-// #[case::java(KafkaDriver::Java)]
-#[tokio::test(flavor = "multi_thread")]
+//#[case::java(KafkaDriver::Java)]
+#[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
 async fn cluster_1_rack_multi_shotover(#[case] driver: KafkaDriver) {
  let _docker_compose =
  docker_compose("tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml");
@@ -230,11 +228,10 @@ async fn cluster_2_racks_multi_shotover(#[case] driver: KafkaDriver) {
  }
 }
 
-#[cfg(feature = "rdkafka-driver-tests")]
 #[rstest]
 #[cfg_attr(feature = "rdkafka-driver-tests", case::cpp(KafkaDriver::Cpp))]
-// #[case::java(KafkaDriver::Java)]
-#[tokio::test]
+#[case::java(KafkaDriver::Java)]
+#[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
 async fn cluster_sasl_single_shotover(#[case] driver: KafkaDriver) {
  let _docker_compose =
  docker_compose("tests/test-configs/kafka/cluster-sasl/docker-compose.yaml");
@@ -255,11 +252,11 @@ async fn cluster_sasl_single_shotover(#[case] driver: KafkaDriver) {
  .expect("Shotover did not shutdown within 10s");
 }
 
-#[cfg(feature = "rdkafka-driver-tests")]
+#[cfg(feature = "rdkafka-driver-tests")] // temporarily needed to avoid a warning
 #[rstest]
 #[cfg_attr(feature = "rdkafka-driver-tests", case::cpp(KafkaDriver::Cpp))]
-// #[case::java(KafkaDriver::Java)]
-#[tokio::test]
+//#[case::java(KafkaDriver::Java)]
+#[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
 async fn cluster_sasl_multi_shotover(#[case] driver: KafkaDriver) {
  let _docker_compose =
  docker_compose("tests/test-configs/kafka/cluster-sasl/docker-compose.yaml");