Merge pull request #148 from epage/error

Errorfix(trycmd): Error, instead of ignore, unknown bins

Author: epage

schema.json

@@ -101,6 +101,12 @@
     "Bin": {
       "description": "Target under test",
       "oneOf": [
+        {
+          "type": "string",
+          "enum": [
+            "ignore"
+          ]
+        },
         {
           "type": "object",
           "required": [

src/registry.rs

@@ -36,6 +36,7 @@ impl BinRegistry {
                 let bin = self.resolve_name(&name);
                 Ok(bin)
             }
+            crate::schema::Bin::Ignore => Ok(crate::schema::Bin::Ignore),
             crate::schema::Bin::Error(err) => Err(err),
         }
     }

src/runner.rs

@@ -321,18 +321,17 @@ impl Case {
             return Ok(output);
         }
 
-        #[allow(unused_variables)]
         match &step.bin {
-            Some(crate::schema::Bin::Path(_)) => {}
-            Some(crate::schema::Bin::Name(name)) => {
+            // Will be handled by `Step::to_command`
+            Some(crate::schema::Bin::Path(_))
+            | Some(crate::schema::Bin::Name(_))
+            | Some(crate::schema::Bin::Error(_))
+            | None => {}
+            Some(crate::schema::Bin::Ignore) => {
                 // Unhandled by resolve
-                snapbox::debug!("bin={:?} not found", name);
                 assert_eq!(output.spawn.status, SpawnStatus::Skipped);
                 return Ok(output);
             }
-            Some(crate::schema::Bin::Error(_)) => {}
-            // Unlike `Name`, this always represents a bug
-            None => {}
         }
 
         let cmd = step.to_command(cwd).map_err(|e| output.clone().error(e))?;

src/schema.rs

@@ -448,6 +448,7 @@ impl Step {
         let bin = match &self.bin {
             Some(Bin::Path(path)) => Ok(path.clone()),
             Some(Bin::Name(name)) => Err(format!("Unknown bin.name = {}", name).into()),
+            Some(Bin::Ignore) => Err("Internal error: tried to run an ignored bin".into()),
             Some(Bin::Error(err)) => Err(err.clone()),
             None => Err("No bin specified".into()),
         }?;
@@ -683,6 +684,7 @@ impl Env {
 pub enum Bin {
     Path(std::path::PathBuf),
     Name(String),
+    Ignore,
     #[serde(skip)]
     Error(crate::Error),
 }

tests/cli_tests.rs

@@ -21,4 +21,5 @@ fn cli_tests() {
         t.skip("tests/cmd/timeout.toml");
     }
     t.extend_vars([("[EXAMPLE]", "example")]).unwrap();
+    t.register_bin("ignored-bin", trycmd::schema::Bin::Ignore);
 }

tests/cmd/ignored_bin.trycmd

@@ -0,0 +1,6 @@
+Ignored by test runner:
+```
+$ ignored-bin I have No Impact
+I'm ignored too
+
+```