Merge pull request moby#4315 from shykes/engine-parsejob-test

vieux · vieux · commit ad88d0be83fa · 2014-02-24T14:27:19.000-08:00
Engine: add tests for ParseJob()
diff --git a/engine/engine_test.go b/engine/engine_test.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 	"testing"
 )
 
@@ -114,3 +115,40 @@ func TestEngineLogf(t *testing.T) {
 		t.Fatalf("Test: Logf() should print at least as much as the input\ninput=%d\nprinted=%d", len(input), n)
 	}
 }
+
+func TestParseJob(t *testing.T) {
+	eng := newTestEngine(t)
+	defer os.RemoveAll(eng.Root())
+	// Verify that the resulting job calls to the right place
+	var called bool
+	eng.Register("echo", func(job *Job) Status {
+		called = true
+		return StatusOK
+	})
+	input := "echo DEBUG=1 hello world VERBOSITY=42"
+	job, err := eng.ParseJob(input)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if job.Name != "echo" {
+		t.Fatalf("Invalid job name: %v", job.Name)
+	}
+	if strings.Join(job.Args, ":::") != "hello:::world" {
+		t.Fatalf("Invalid job args: %v", job.Args)
+	}
+	if job.Env().Get("DEBUG") != "1" {
+		t.Fatalf("Invalid job env: %v", job.Env)
+	}
+	if job.Env().Get("VERBOSITY") != "42" {
+		t.Fatalf("Invalid job env: %v", job.Env)
+	}
+	if len(job.Env().Map()) != 2 {
+		t.Fatalf("Invalid job env: %v", job.Env)
+	}
+	if err := job.Run(); err != nil {
+		t.Fatal(err)
+	}
+	if !called {
+		t.Fatalf("Job was not called")
+	}
+}
diff --git a/engine/env.go b/engine/env.go
@@ -37,7 +37,7 @@ func (env *Env) Exists(key string) bool {
 }
 
 func (env *Env) Init(src *Env) {
-	*env = make([]string, 0, len(*src))
+	(*env) = make([]string, 0, len(*src))
 	for _, val := range *src {
 		(*env) = append((*env), val)
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (env *Env) Exists(key string) bool {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (env Env) Init(src Env) {`
`40`		`- env = make([]string, 0, len(src))`
	`40`	`+ (env) = make([]string, 0, len(src))`
`41`	`41`	`for _, val := range *src {`
`42`	`42`	`(env) = append((env), val)`
`43`	`43`	`}`