Factor out progress code

faradayio · Oct 16, 2023 · d1fb002 · d1fb002
1 parent 6a4780a
commit d1fb002
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/cmd/sql_test.rs b/src/cmd/sql_test.rs
@@ -75,23 +75,20 @@ pub async fn cmd_sql_test(opt: &SqlTestOpt) -> Result<()> {
             if let Some(pending_test_info) =
                 PendingTestInfo::for_target(driver.target(), short_path, &query)
             {
+                progress('P');
                 pending.push(pending_test_info);
-                print!("P");
-                let _ = io::stdout().flush();
                 continue;
             }
         }
 
         // Test query.
         match run_test(&mut *driver, &path, &query).await {
             Ok(_) => {
-                print!(".");
-                let _ = io::stdout().flush();
+                progress('.');
                 test_ok_count += 1;
             }
             Err(e) => {
-                print!("E");
-                let _ = io::stdout().flush();
+                progress('E');
                 test_failures.push((path, e));
             }
         }
@@ -129,6 +126,12 @@ pub async fn cmd_sql_test(opt: &SqlTestOpt) -> Result<()> {
     result
 }
 
+/// Print a progress indicator for a single test.
+fn progress(c: char) {
+    print!("{}", c);
+    let _ = io::stdout().flush();
+}
+
 #[instrument(skip_all, fields(path = %path.display()))]
 async fn run_test(
     driver: &mut dyn Driver,