@@ -114,7 +114,7 @@ fn return_result(size: usize, tx: Sender<Tuple>) -> Result<(), ExecutorError> {
114114#[ cfg( test) ]
115115mod tests {
116116 use crate :: catalog:: { ColumnCatalog , ColumnDesc } ;
117- use crate :: db:: Database ;
117+ use crate :: db:: { Database , DatabaseError } ;
118118 use futures:: StreamExt ;
119119 use std:: io:: Write ;
120120 use std:: sync:: Arc ;
@@ -125,7 +125,7 @@ mod tests {
125125 use crate :: types:: LogicalType ;
126126
127127 #[ tokio:: test]
128- async fn read_csv ( ) {
128+ async fn read_csv ( ) -> Result < ( ) , DatabaseError > {
129129 let csv = "1,1.5,one\n 2,2.5,two\n " ;
130130
131131 let mut file = tempfile:: NamedTempFile :: new ( ) . expect ( "failed to create temp file" ) ;
@@ -189,16 +189,18 @@ mod tests {
189189 } ;
190190
191191 let temp_dir = TempDir :: new ( ) . unwrap ( ) ;
192- let db = Database :: with_kipdb ( temp_dir. path ( ) ) . await . unwrap ( ) ;
192+ let db = Database :: with_kipdb ( temp_dir. path ( ) ) . await ? ;
193193 let _ = db
194194 . run ( "create table test_copy (a int primary key, b float, c varchar(10))" )
195195 . await ;
196- let actual = executor. execute ( & db. storage ) . next ( ) . await . unwrap ( ) . unwrap ( ) ;
196+ let actual = executor. execute ( & db. storage ) . next ( ) . await . unwrap ( ) ? ;
197197
198198 let tuple_builder = TupleBuilder :: new_result ( ) ;
199199 let expected = tuple_builder
200200 . push_result ( "COPY FROM SOURCE" , format ! ( "import {} rows" , 2 ) . as_str ( ) )
201201 . unwrap ( ) ;
202202 assert_eq ! ( actual, expected) ;
203+
204+ Ok ( ( ) )
203205 }
204206}
0 commit comments