Changeset 6 in code

Timestamp:

Dec 5, 2014, 6:21:42 PM (11 years ago)

Author:

zaitsev.serge

Message:

added tests for eval command runner

Location:

trunk

Files:

• zs.go (modified) (1 diff)
• zs_test.go (modified) (2 diffs)

trunk/zs.go

@@ -111 +111 @@
         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
                 }

trunk/zs_test.go

@@ -6 +6 @@
         "log"
         "os"
+        "os/exec"
         "strings"
         "testing"
@@ -124 +125 @@
 }
 
+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" {