GH-800: add test for the logs; all tests passing

node/src/proxy_client/stream_establisher.rs

@@ -61,7 +61,6 @@ impl StreamEstablisher {
             payload.target_port,
             &self.logger,
         )?;
-        // TODO: GH-800: Change it to a tokio channel instead of a crossbeam channel
         let (shutdown_signal_tx, shutdown_signal_rx) = tokio::sync::mpsc::unbounded_channel();
 
         self.spawn_stream_reader(

node/src/proxy_client/stream_handler_pool.rs

@@ -163,10 +163,13 @@ impl StreamHandlerPoolReal {
         stream_key: &StreamKey,
         logger: &Logger,
     ) {
-        // TODO: GH-800: Test Drive Me especially the logs
         match reader_shutdown_tx.try_send(()) {
             Ok(()) => {
-                debug!(logger, "A shutdown signal was sent.")
+                debug!(
+                    logger,
+                    "A shutdown signal was sent to the StreamReader for stream key {:?}.",
+                    stream_key
+                );
             }
             Err(_e) => {
                 debug!(
@@ -1087,7 +1090,12 @@ mod tests {
         let future_with_timeout =
             tokio::timer::Timeout::new(future_result, Duration::from_secs(10)).into_future();
         assert!(system.block_on(future_with_timeout).is_ok());
-        TestLogHandler::new().exists_log_containing(&format!(
+        let tlh = TestLogHandler::new();
+        tlh.exists_log_containing(&format!(
+            "DEBUG: {test_name}: A shutdown signal was sent to the StreamReader \
+            for stream key oUHoHuDKHjeWq+BJzBIqHpPFBQw."
+        ));
+        tlh.exists_log_containing(&format!(
             "DEBUG: {test_name}: Removing StreamWriter and Shutting down StreamReader \
             for oUHoHuDKHjeWq+BJzBIqHpPFBQw to 3.4.5.6:80"
         ));

node/tests/connection_shutdown_test.rs

@@ -43,7 +43,7 @@ fn proxy_client_stream_reader_dies_when_client_stream_is_killed_integration() {
 
     let write_error = server_write_error_rx
         .recv_timeout(Duration::from_secs(60))
-        .unwrap(); // TODO: GH-800 We are failing on this timeout
+        .unwrap();
     assert_eq!(write_error.kind(), io::ErrorKind::BrokenPipe);
     join_handle.join().unwrap();
 }