Merge pull request #70 from iqlusioninc/testing/simplify-error-handling

testing: Simplify error handling

abscissa_generator/template/tests/acceptance.rs.hbs

@@ -8,12 +8,7 @@ use abscissa::testing::CmdRunner;
 
 #[test]
 fn start_no_args() {
-    let mut cmd = CmdRunner::default()
-        .arg("start")
-        .capture_stdout()
-        .run()
-        .unwrap();
-
+    let mut cmd = CmdRunner::default().arg("start").capture_stdout().run();
     cmd.stdout().expect_line("Hello, world!");
     cmd.wait().unwrap().expect_success();
 }
@@ -23,8 +18,7 @@ fn start_with_args() {
     let mut cmd = CmdRunner::default()
         .args(&["start", "acceptance", "test"])
         .capture_stdout()
-        .run()
-        .unwrap();
+        .run();
 
     cmd.stdout().expect_line("Hello, acceptance test!");
     cmd.wait().unwrap().expect_success();

src/lib.rs

@@ -1,4 +1,4 @@
-//! Abscissa: an application microframework
+//! ![Abscissa](https://www.iqlusion.io/img/github/iqlusioninc/abscissa/abscissa.svg)
 //!
 //! Abscissa is a microframework for building Rust applications (either CLI tools
 //! or network services), aiming to provide a large number of features with a
@@ -23,8 +23,7 @@
 //!
 //! # Creating a new Abscissa application
 //!
-//! If you already have Rust installed, the following commands will generate an
-//! Abscissa application skeleton:
+//! The following commands will generate an Abscissa application skeleton:
 //!
 //! ```text
 //! $ cargo install abscissa

src/testing.rs

@@ -99,7 +99,7 @@ impl CargoRunner {
     }
 
     /// Run the given subcommand
-    pub fn run(&self) -> Result<Process, FrameworkError> {
+    pub fn run(&self) -> Process {
         self.print_command().unwrap();
 
         let stdout = if self.capture_stdout {
@@ -119,14 +119,19 @@ impl CargoRunner {
             .stdin(Stdio::piped())
             .stdout(stdout)
             .stderr(stderr)
-            .spawn()?;
+            .spawn()
+            .unwrap_or_else(|e| {
+                panic!("error running command: {}", e);
+            });
 
-        Ok(Process::new(child, self.timeout))
+        Process::new(child, self.timeout)
     }
 
     /// Get the exit status for the given subcommand
-    pub fn status(&self) -> Result<ExitStatus, FrameworkError> {
-        self.run()?.wait()
+    pub fn status(&self) -> ExitStatus {
+        self.run().wait().unwrap_or_else(|e| {
+            panic!("error waiting for subprocess to terminate: {}", e);
+        })
     }
 
     /// Print the command we're about to run
@@ -225,7 +230,17 @@ impl CmdRunner {
     }
 
     /// Invoke `cargo run` with the given arguments
-    pub fn run(&self) -> Result<Process, FrameworkError> {
+    pub fn run(&self) -> Process {
+        self.runner().run()
+    }
+
+    /// Get the exit status after invoking the given command
+    pub fn status(&self) -> ExitStatus {
+        self.runner().status()
+    }
+
+    /// Construct a `CargoRunner` based on the configuration
+    fn runner(&self) -> CargoRunner {
         let mut runner = CargoRunner::default();
 
         // Invoke `cargo run`.
@@ -250,12 +265,7 @@ impl CmdRunner {
             runner.capture_stderr();
         }
 
-        runner.run()
-    }
-
-    /// Get the exit status after invoking the given command
-    pub fn status(&self) -> Result<ExitStatus, FrameworkError> {
-        self.run()?.wait()
+        runner
     }
 }
 

tests/app/exit_status.rs

@@ -7,7 +7,6 @@ fn no_args() {
     CmdRunner::default()
         .capture_stdout()
         .status()
-        .unwrap()
         .expect_success();
 }
 
@@ -17,6 +16,5 @@ fn invalid_args() {
         .arg("foobar") // invalid arg
         .capture_stdout()
         .status()
-        .unwrap()
         .expect_code(1);
 }

tests/generate_app.rs

@@ -28,7 +28,6 @@ fn test_generated_app() {
     for test_command in TEST_COMMANDS {
         CargoRunner::new(test_command.split(" "))
             .status()
-            .unwrap()
             .expect_success();
     }
 }
@@ -48,7 +47,6 @@ fn generate_app(path: &Path) {
             &abscissa_crate_patch,
         ])
         .status()
-        .unwrap()
         .expect_success();
 
     let app_test_dir = path.join("tests");