[test] Use testutil for TestLoadWorkspace

Author: csweichel

pkg/leeway/fixtures/load-workspace.yaml

@@ -0,0 +1,48 @@
+workspace:
+  environmentManifest:
+    - name: "foobar"
+      command: ["echo", "foobar"]
+  defaultArgs:
+    message: "hello root"
+
+components:
+  - location: wsa/pkg0
+    packages:
+    - name: app
+      type: generic
+      config:
+        commands:
+        - ["echo"]
+  - location: wsa/pkg1
+    packages:
+    - name: app
+      type: generic
+      config:
+        commands:
+        - ["echo"]
+    scripts:
+    - name: echo
+      script: |
+        echo ${message}
+  - location: wsa
+    packages:
+    - name: app
+      type: generic
+      config:
+        commands:
+        - ["echo", "${message}"]
+    scripts:
+    - name: echo
+      script: |
+        echo ${message}
+  - location: deeper/pkg0
+    packages:
+    - name: app
+      type: generic
+      deps:
+      - wsa/pkg0:app
+      - wsa/pkg1:app
+      - wsa:app
+      config:
+        commands:
+        - ["echo"]

pkg/leeway/scripts_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/gitpod-io/leeway/cmd"
+	"github.com/gitpod-io/leeway/pkg/testutil"
 )
 
 var dut = flag.Bool("dut", false, "run command/device under test")
@@ -104,6 +105,8 @@ type CommandFixtureTest struct {
 	StderrSub         string
 	NoStderrSub       string
 	Eval              func(t *testing.T, stdout, stderr string)
+	Fixture           *testutil.Setup
+	FixturePath       string
 }
 
 // Run executes the fixture test - do not forget to call this one
@@ -114,6 +117,40 @@ func (ft *CommandFixtureTest) Run() {
 	}
 
 	ft.T.Run(ft.Name, func(t *testing.T) {
+		loc := "../../"
+
+		if ft.FixturePath != "" {
+			fp, err := os.Open(ft.FixturePath)
+			if err != nil {
+				t.Fatalf("cannot load fixture from %s: %v", ft.FixturePath, err)
+			}
+			ft.Fixture, err = testutil.LoadFromYAML(fp)
+			fp.Close()
+			if err != nil {
+				t.Fatalf("cannot load fixture from %s: %v", ft.FixturePath, err)
+			}
+		}
+		if ft.Fixture != nil {
+			var err error
+			loc, err = ft.Fixture.Materialize()
+			if err != nil {
+				t.Fatalf("cannot materialize fixture: %v", err)
+			}
+			t.Logf("materialized fixture workspace: %s", loc)
+			t.Cleanup(func() { os.RemoveAll(loc) })
+		}
+
+		env := os.Environ()
+		n := 0
+		for _, x := range env {
+			if strings.HasPrefix(x, "LEEWAY_") {
+				continue
+			}
+			env[n] = x
+			n++
+		}
+		env = env[:n]
+
 		self, err := os.Executable()
 		if err != nil {
 			t.Fatalf("cannot identify test binary: %q", err)
@@ -125,7 +162,8 @@ func (ft *CommandFixtureTest) Run() {
 		)
 		cmd.Stdout = sout
 		cmd.Stderr = serr
-		cmd.Dir = "../../"
+		cmd.Dir = loc
+		cmd.Env = env
 		err = cmd.Run()
 
 		var exitCode int

pkg/leeway/workspace_test.go

@@ -16,39 +16,34 @@ func TestFixtureLoadWorkspace(t *testing.T) {
 		{
 			Name:              "single workspace packages",
 			T:                 t,
-			Args:              []string{"collect", "-w", "fixtures/nested-ws/wsa"},
+			Args:              []string{"collect"},
 			NoNestedWorkspace: true,
 			ExitCode:          0,
 			StdoutSub:         "pkg1:app",
+			FixturePath:       "fixtures/load-workspace.yaml",
 		},
 		{
 			Name:              "workspace components",
 			T:                 t,
-			Args:              []string{"collect", "-w", "fixtures/nested-ws/wsa", "components"},
+			Args:              []string{"collect", "components"},
 			NoNestedWorkspace: true,
 			ExitCode:          0,
-			StdoutSub:         "//\npkg0\npkg1",
-		},
-		{
-			Name:              "ignore nested workspaces",
-			T:                 t,
-			Args:              []string{"collect", "-w", "fixtures/nested-ws", "components"},
-			NoNestedWorkspace: true,
-			ExitCode:          1,
-			StderrSub:         "pkg0:app: package \\\"wsa/pkg0:app\\\" is unknown",
+			StdoutSub:         "deeper/pkg0\nwsa\nwsa/pkg0\nwsa/pkg1",
+			FixturePath:       "fixtures/load-workspace.yaml",
 		},
 		{
 			Name: "environment manifest",
 			T:    t,
-			Args: []string{"describe", "-w", "fixtures/nested-ws/wsa", "environment-manifest"},
+			Args: []string{"describe", "environment-manifest"},
 			Eval: func(t *testing.T, stdout, stderr string) {
 				for _, k := range []string{"os", "arch", "foobar"} {
 					if !strings.Contains(stdout, fmt.Sprintf("%s: ", k)) {
 						t.Errorf("missing %s entry in environment manifest", k)
 					}
 				}
 			},
-			ExitCode: 0,
+			ExitCode:    0,
+			FixturePath: "fixtures/load-workspace.yaml",
 		},
 	}