diff --git a/Cargo.lock b/Cargo.lock index db8914b0b2dd7..5e6262b419876 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10058,7 +10058,7 @@ dependencies = [ [[package]] name = "rdkafka" version = "0.29.0" -source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#c8d7ae601896af0efe9d737dfb0f84bea25b8518" +source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#642daa6e293065ec653c04f2d1147a7675ce2430" dependencies = [ "futures-channel", "futures-util", @@ -10075,7 +10075,7 @@ dependencies = [ [[package]] name = "rdkafka-sys" version = "4.3.0+2.5.0" -source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#c8d7ae601896af0efe9d737dfb0f84bea25b8518" +source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#642daa6e293065ec653c04f2d1147a7675ce2430" dependencies = [ "cmake", "libc", diff --git a/test/kafka-auth/test-kafka-sasl-ssl.td b/test/kafka-auth/test-kafka-sasl-ssl.td index 2834ee5aeb94c..5db3c97a1ec56 100644 --- a/test/kafka-auth/test-kafka-sasl-ssl.td +++ b/test/kafka-auth/test-kafka-sasl-ssl.td @@ -28,7 +28,7 @@ banana SASL PASSWORD SECRET password, SECURITY PROTOCOL SASL_PLAINTEXT ) -contains:Disconnected during handshake; broker might require SSL encryption +contains:Disconnected: connection closed by peer: receive 0 after POLLIN ! CREATE CONNECTION kafka_invalid TO KAFKA ( BROKER 'kafka:9096', diff --git a/test/kafka-auth/test-kafka-ssl.td b/test/kafka-auth/test-kafka-ssl.td index 5aa509339521c..c3a7442679c29 100644 --- a/test/kafka-auth/test-kafka-ssl.td +++ b/test/kafka-auth/test-kafka-ssl.td @@ -26,7 +26,7 @@ banana BROKER 'kafka:9093', SECURITY PROTOCOL PLAINTEXT ) -contains:Disconnected during handshake; broker might require SSL encryption +contains:Disconnected: connection closed by peer: receive 0 after POLLIN ! CREATE CONNECTION kafka_invalid TO KAFKA ( BROKER 'kafka:9093' @@ -44,7 +44,7 @@ contains:Invalid CA certificate BROKER 'kafka:9093', SSL CERTIFICATE AUTHORITY = 'this is garbage' ) -contains:ssl.ca.pem failed: not in PEM format? +contains:failed to read certificate #0 from ssl.ca.pem: not in PEM format?: # ==> Test without an SSH tunnel. <== diff --git a/test/source-sink-errors/mzcompose.py b/test/source-sink-errors/mzcompose.py index aa4d56fbe078f..4c1e5b631320b 100644 --- a/test/source-sink-errors/mzcompose.py +++ b/test/source-sink-errors/mzcompose.py @@ -331,7 +331,8 @@ def assert_error(self, c: Composition, error: str) -> None: c.testdrive( dedent( f""" - $ set-sql-timeout duration=60s + # Takes > 60s following librdkafka update + $ set-sql-timeout duration=240s # Sinks generally halt after receiving an error, which means that they may alternate # between `stalled` and `starting`. Instead of relying on the current status, we # check that there is a stalled status with the expected error.