added tests for eval command runner

diff --git a/zs.go b/zs.go
index 697d77819903667c2ca1d3207d2b8a8137ca7485..1db764caa195b4c77e91faca1dfcf36f8ffc4c5a 100644 (file)
--- a/zs.go
+++ b/zs.go
@@ -110,10 +110,13 @@ func eval(cmd []string, vars map[string]string) (string, error) {
        outbuf := bytes.NewBuffer(nil)
        err := run(path.Join(ZSDIR, cmd[0]), cmd[1:], vars, outbuf)
        if err != nil {
-               log.Println(err)
+               if _, ok := err.(*exec.ExitError); ok {
+                       return "", err
+               }
                outbuf = bytes.NewBuffer(nil)
                err := run(cmd[0], cmd[1:], vars, outbuf)
-               if err != nil {
+               // Return exit errors, but ignore if the command was not found
+               if _, ok := err.(*exec.ExitError); ok {
                        return "", err
                }
        }

diff --git a/zs_test.go b/zs_test.go
index b4ee3b1f74a87b614c45af0a5eb42d88a7c1bae7..5aeb1c8c49fbdaf1b08f134cd20f98bfae6cba4d 100644 (file)
--- a/zs_test.go
+++ b/zs_test.go
@@ -5,6 +5,7 @@ import (
        "fmt"
        "log"
        "os"
+       "os/exec"
        "strings"
        "testing"
 )
@@ -123,6 +124,24 @@ func TestRun(t *testing.T) {
        }
 }
 
+func TestEvalCommand(t *testing.T) {
+       s, err := eval([]string{"echo", "hello"}, map[string]string{})
+       if err != nil {
+               t.Error(err)
+       }
+       if s != "hello\n" {
+               t.Error(s)
+       }
+       _, err = eval([]string{"cat", "bogus/file"}, map[string]string{})
+       if _, ok := err.(*exec.ExitError); !ok {
+               t.Error("expected ExitError")
+       }
+       _, err = eval([]string{"missing command"}, map[string]string{})
+       if err != nil {
+               t.Error("missing command should be ignored")
+       }
+}
+
 func TestHelperProcess(*testing.T) {
        if os.Getenv("ZS_HELPER") != "1" {
                return