test: add test for FlightSQL CLI client (#3816)

* test: add test for FlightSQL CLI client Closes #3814. * refactor: improve test code Co-authored-by: Andrew Lamb <[email protected]> --------- Co-authored-by: Andrew Lamb <[email protected]>
apache · Mar 9, 2023 · fb35d26 · fb35d26
1 parent fb1dcc6
commit fb35d26
Show file tree

Hide file tree

Showing 3 changed files with 554 additions and 1 deletion.
diff --git a/arrow-flight/Cargo.toml b/arrow-flight/Cargo.toml
@@ -60,6 +60,7 @@ cli = ["arrow/prettyprint", "clap", "tracing-log", "tracing-subscriber", "tonic/
 
 [dev-dependencies]
 arrow = { version = "34.0.0", path = "../arrow", features = ["prettyprint"] }
+assert_cmd = "2.0.8"
 tempfile = "3.3"
 tokio-stream = { version = "0.1", features = ["net"] }
 tower = "0.4.13"
@@ -78,3 +79,8 @@ required-features = ["flight-sql-experimental", "tls"]
 [[bin]]
 name = "flight_sql_client"
 required-features = ["cli", "flight-sql-experimental", "tls"]
+
+[[test]]
+name = "flight_sql_client_cli"
+path = "tests/flight_sql_client_cli.rs"
+required-features = ["cli", "flight-sql-experimental", "tls"]
diff --git a/arrow-flight/src/bin/flight_sql_client.rs b/arrow-flight/src/bin/flight_sql_client.rs
@@ -144,7 +144,9 @@ fn setup_logging() {
 async fn setup_client(args: ClientArgs) -> Result<FlightSqlServiceClient> {
     let port = args.port.unwrap_or(if args.tls { 443 } else { 80 });
 
-    let mut endpoint = Endpoint::new(format!("https://{}:{}", args.host, port))
+    let protocol = if args.tls { "https" } else { "http" };
+
+    let mut endpoint = Endpoint::new(format!("{}://{}:{}", protocol, args.host, port))
         .map_err(|_| ArrowError::IoError("Cannot create endpoint".to_string()))?
         .connect_timeout(Duration::from_secs(20))
         .timeout(Duration::from_secs(20))