From 4a66d43249c20d72f25c327de32ca5d578493243 Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Wed, 20 Nov 2024 15:39:30 +0000 Subject: [PATCH] Build fixes --- src/Client/ClientBase.cpp | 3 +++ src/Client/ClientBase.h | 4 ++++ tests/integration/test_ssh/test.py | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp index 9cc9ffb7b98..599751a526c 100644 --- a/src/Client/ClientBase.cpp +++ b/src/Client/ClientBase.cpp @@ -296,6 +296,9 @@ ClientBase::ClientBase( , std_out(out_fd_) , progress_indication(output_stream_, in_fd_, err_fd_) , progress_table(output_stream_, in_fd_, err_fd_) + , in_fd(in_fd_) + , out_fd(out_fd_) + , err_fd(err_fd_) , input_stream(input_stream_) , output_stream(output_stream_) , error_stream(error_stream_) diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h index 6b1a5172901..b31a690df1e 100644 --- a/src/Client/ClientBase.h +++ b/src/Client/ClientBase.h @@ -404,6 +404,10 @@ protected: std::atomic_bool cancelled = false; std::atomic_bool cancelled_printed = false; + int in_fd = STDIN_FILENO; + int out_fd = STDOUT_FILENO; + int err_fd = STDERR_FILENO; + /// Unpacked descriptors and streams for the ease of use. std::istream & input_stream; std::ostream & output_stream; diff --git a/tests/integration/test_ssh/test.py b/tests/integration/test_ssh/test.py index b60f1922519..586e4195f59 100644 --- a/tests/integration/test_ssh/test.py +++ b/tests/integration/test_ssh/test.py @@ -1,6 +1,8 @@ -import subprocess -import pytest import os +import subprocess + +import pytest + from helpers.cluster import ClickHouseCluster cluster = ClickHouseCluster(__file__)