Merge pull request #641 from diesel-rs/sg-dont-panic-in-cli-drop

Don't panic while panicking in CLI's tests
diesel-rs · Feb 8, 2017 · c0037b1 · c0037b1
2 parents 6570663 + 9073602
commit c0037b1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/diesel_cli/tests/support/command.rs b/diesel_cli/tests/support/command.rs
@@ -66,6 +66,15 @@ impl CommandResult {
     pub fn code(&self) -> i32 {
         self.output.status.code().unwrap()
     }
+
+    #[allow(dead_code)]
+    pub fn result(self) -> Result<Self, Self> {
+        if self.is_success() {
+            Ok(self)
+        } else {
+            Err(self)
+        }
+    }
 }
 
 fn path_to_diesel_cli() -> PathBuf {

diff --git a/diesel_cli/tests/support/mod.rs b/diesel_cli/tests/support/mod.rs
@@ -1,3 +1,18 @@
+macro_rules! try_drop {
+    ($e:expr, $msg:expr) => { match $e {
+        Ok(x) => x,
+        Err(e) => {
+            use ::std::io::{Write, stderr};
+            if ::std::thread::panicking() {
+                write!(stderr(), "{}: {:?}", $msg, e);
+                return;
+            } else {
+                panic!("{}: {:?}", $msg, e);
+            }
+        }
+    }}
+}
+
 mod command;
 mod project_builder;
 

diff --git a/diesel_cli/tests/support/postgres_database.rs b/diesel_cli/tests/support/postgres_database.rs
@@ -54,9 +54,9 @@ impl Database {
 impl Drop for Database {
     fn drop(&mut self) {
         let (database, postgres_url) = self.split_url();
-        let conn = PgConnection::establish(&postgres_url).unwrap();
+        let conn = try_drop!(PgConnection::establish(&postgres_url), "Couldn't connect to database");
         conn.silence_notices(|| {
-            conn.execute(&format!("DROP DATABASE IF EXISTS {}", database)).unwrap();
+            try_drop!(conn.execute(&format!("DROP DATABASE IF EXISTS {}", database)), "Couldn't drop database");
         });
     }
 }
diff --git a/diesel_cli/tests/support/project_builder.rs b/diesel_cli/tests/support/project_builder.rs
@@ -99,17 +99,7 @@ impl Project {
 #[cfg(feature = "postgres")]
 impl Drop for Project {
     fn drop(&mut self) {
-        use std::io::{self, Write};
-        use std::thread;
-
-        let result = self.command("database").arg("drop").run();
-        if !result.is_success() {
-            if thread::panicking() {
-                writeln!(io::stderr(), "Couldn't drop database: {:?}", result).unwrap();
-            } else {
-                panic!("Couldn't drop database: {:?}", result);
-            }
-        }
+        try_drop!(self.command("database").arg("drop").run().result(), "Couldn't drop database");
     }
 }