@@ -46,15 +46,19 @@ use tonic::{Request, Response, Status, Streaming};
4646
4747const QUERY : & str = "SELECT * FROM table;" ;
4848
49+ /// Return a Command instance for running the `flight_sql_client` CLI
50+ fn flight_sql_client_cmd ( ) -> Command {
51+ Command :: new ( assert_cmd:: cargo:: cargo_bin!( "flight_sql_client" ) )
52+ }
53+
4954#[ tokio:: test]
5055async fn test_simple ( ) {
5156 let test_server = FlightSqlServiceImpl :: default ( ) ;
5257 let fixture = TestFixture :: new ( test_server. service ( ) ) . await ;
5358 let addr = fixture. addr ;
5459
5560 let stdout = tokio:: task:: spawn_blocking ( move || {
56- Command :: cargo_bin ( "flight_sql_client" )
57- . unwrap ( )
61+ flight_sql_client_cmd ( )
5862 . env_clear ( )
5963 . env ( "RUST_BACKTRACE" , "1" )
6064 . env ( "RUST_LOG" , "warn" )
@@ -94,8 +98,7 @@ async fn test_get_catalogs() {
9498 let addr = fixture. addr ;
9599
96100 let stdout = tokio:: task:: spawn_blocking ( move || {
97- Command :: cargo_bin ( "flight_sql_client" )
98- . unwrap ( )
101+ flight_sql_client_cmd ( )
99102 . env_clear ( )
100103 . env ( "RUST_BACKTRACE" , "1" )
101104 . env ( "RUST_LOG" , "warn" )
@@ -133,8 +136,7 @@ async fn test_get_db_schemas() {
133136 let addr = fixture. addr ;
134137
135138 let stdout = tokio:: task:: spawn_blocking ( move || {
136- Command :: cargo_bin ( "flight_sql_client" )
137- . unwrap ( )
139+ flight_sql_client_cmd ( )
138140 . env_clear ( )
139141 . env ( "RUST_BACKTRACE" , "1" )
140142 . env ( "RUST_LOG" , "warn" )
@@ -173,8 +175,7 @@ async fn test_get_tables() {
173175 let addr = fixture. addr ;
174176
175177 let stdout = tokio:: task:: spawn_blocking ( move || {
176- Command :: cargo_bin ( "flight_sql_client" )
177- . unwrap ( )
178+ flight_sql_client_cmd ( )
178179 . env_clear ( )
179180 . env ( "RUST_BACKTRACE" , "1" )
180181 . env ( "RUST_LOG" , "warn" )
@@ -212,8 +213,7 @@ async fn test_get_tables_db_filter() {
212213 let addr = fixture. addr ;
213214
214215 let stdout = tokio:: task:: spawn_blocking ( move || {
215- Command :: cargo_bin ( "flight_sql_client" )
216- . unwrap ( )
216+ flight_sql_client_cmd ( )
217217 . env_clear ( )
218218 . env ( "RUST_BACKTRACE" , "1" )
219219 . env ( "RUST_LOG" , "warn" )
@@ -253,8 +253,7 @@ async fn test_get_tables_types() {
253253 let addr = fixture. addr ;
254254
255255 let stdout = tokio:: task:: spawn_blocking ( move || {
256- Command :: cargo_bin ( "flight_sql_client" )
257- . unwrap ( )
256+ flight_sql_client_cmd ( )
258257 . env_clear ( )
259258 . env ( "RUST_BACKTRACE" , "1" )
260259 . env ( "RUST_LOG" , "warn" )
@@ -295,8 +294,7 @@ async fn test_do_put_prepared_statement(test_server: FlightSqlServiceImpl) {
295294 let addr = fixture. addr ;
296295
297296 let stdout = tokio:: task:: spawn_blocking ( move || {
298- Command :: cargo_bin ( "flight_sql_client" )
299- . unwrap ( )
297+ flight_sql_client_cmd ( )
300298 . env_clear ( )
301299 . env ( "RUST_BACKTRACE" , "1" )
302300 . env ( "RUST_LOG" , "warn" )
0 commit comments