E2E tests working.

Author: trulede

Makefile

@@ -1,6 +1,7 @@
 # Variables
-BINARY_NAME=e2e
+BINARY_NAME=re2e
 SRC_DIR=./cmd/e2e
+SRCS := $(shell find ./ -name '*.go')
 BUILD_DIR=bin
 DIST_DIR     = dist
 MODULE_PATH = github.com/go-rivet/e2e/internal/version
@@ -39,7 +40,8 @@ endif
 all: help
 
 ## build: Build the binary for the current OS/Architecture
-build:
+build: $(BUILD_DIR)/$(BINARY_NAME)
+$(BUILD_DIR)/$(BINARY_NAME): $(SRCS)
 	@echo "Building $(BINARY_NAME)..."
 	@mkdir -p $(BUILD_DIR)
 	CGO_ENABLED=0 go build \
@@ -50,6 +52,13 @@ build:
 	@chmod +x $(BUILD_DIR)/$(BINARY_NAME)
 	@echo "Binary built at $(BUILD_DIR)/$(BINARY_NAME)"
 
+## install: Install the binary to the standard user Go bin directory
+install: build
+	@echo "Installing $(BINARY_NAME) to $(GOBIN)..."
+	@mkdir -p $(GOBIN)
+	@cp $(BUILD_DIR)/$(BINARY_NAME) $(GOBIN)/$(BINARY_NAME)
+	@echo "Installation successful."
+
 ## run: Build and run the local binary immediately
 run: build
 	./$(BUILD_DIR)/$(BINARY_NAME)
@@ -78,13 +87,6 @@ clean:
 	rm -rf $(BUILD_DIR)
 	rm -rf $(DIST_DIR)
 
-## install: Install the binary to the standard user Go bin directory
-install: build
-	@echo "Installing $(BINARY_NAME) to $(GOBIN)..."
-	@mkdir -p $(GOBIN)
-	@cp $(BUILD_DIR)/$(BINARY_NAME) $(GOBIN)/$(BINARY_NAME)
-	@echo "Installation successful."
-
 ## help: Show this help screen
 help:
 	@echo "Usage: make [target]"

catalog/cli/cli.flags.init.txtar

@@ -0,0 +1,20 @@
+# Test: init
+rivet --init
+exists Taskfile.yml
+stdout 'Taskfile created: Taskfile.yml'
+filecontains Taskfile.yml expect
+rivet
+stdout 'Hello, world!'
+
+-- expect --
+version: '3'
+
+vars:
+  GREETING: Hello, world!
+
+tasks:
+  default:
+    desc: Print a greeting message
+    cmds:
+      - echo "{{.GREETING}}"
+    silent: true

catalog/cli/cli.flags.version.txtar

@@ -0,0 +1,5 @@
+# Test: version
+rivet --version
+stdout 'Rivet:  v'
+stdout 'Commit: '
+stdout 'Built:  '

catalog/watch/watch.interval.txtar

@@ -0,0 +1,34 @@
+skip
+
+mkdir src
+
+# Test with extended interval, change should not be detected.
+task &
+sleep 500ms
+touch src/a
+sleep 500ms
+kill -INT
+wait
+cmp stdout expect_stdout
+cmp stderr expect_stderr
+
+
+-- Taskfile.yml --
+version: '3'
+interval: 1200ms
+tasks:
+  default:
+    watch: true
+    sources:
+      - "src/*"
+    cmds:
+      - echo "Task running!"
+      - sleep 2
+
+-- expect_stdout --
+Task running!
+task: Signal received: "interrupt"
+-- expect_stderr --
+task: Started watching for tasks: default
+task: [default] echo "Task running!"
+task: [default] sleep 2

catalog/watch/watch.service.txtar

@@ -0,0 +1,81 @@
+skip
+
+# Build the service.
+mkdir $WORK/.cache/go-build
+env GOCACHE=$WORK/.cache/go-build
+task build
+
+# Test that the service is restarted when watched file changed.
+task run &
+sleep 0.5s
+touch watch.file
+sleep 0.5s
+kill -INT
+wait
+stdout 'Service received signal: interrupt'
+stdout 'Starting Service'
+stdout 'Wait for signal'
+grep -count=1 'Service received signal: interrupt'
+grep -count=2 'Starting Service'
+grep -count=2 'Wait for signal'
+
+# Test that the service is _not_ restarted when an excluded file is changed.
+task -s run &
+sleep 0.5s
+touch watch.exclude
+sleep 0.5s
+kill -INT
+wait
+! stdout 'Service received signal: interrupt'
+stdout 'Starting Service'
+stdout 'Wait for signal'
+! grep 'Service received signal: interrupt'
+grep -count=1 'Starting Service'
+grep -count=1 'Wait for signal'
+
+
+-- Taskfile.yml --
+
+version: '3'
+tasks:
+  provision:
+    cmds:
+      - touch watch.exclude
+  build:
+    sources:
+      - 'service.go'
+    generates:
+      - './out/service'
+    cmds:
+      - rm -rf ./out
+      - task: provision
+      - go build -o ./out/ service.go
+  run:
+    deps: [run:service]
+    watch: true
+    sources:
+      - 'watch.file'
+      - exclude: 'watch.exclude'
+    method: none
+  run:service:
+    cmds:
+      - './out/service'
+
+
+-- service.go --
+package main
+
+import (
+    "fmt"
+    "os"
+    "os/signal"
+)
+
+func main() {
+    fmt.Println("Starting Service ...")
+    c := make (chan os.Signal, 1)
+    signal.Notify(c)
+    fmt.Println("Wait for signal ...")
+    s := <-c
+    fmt.Println("Service received signal:", s)
+}

cmd/e2e/main.go

@@ -18,10 +18,19 @@ type Flags struct {
 func parseFlags() Flags {
 	var flags Flags
 
-	pflag.StringVarP(&flags.TestDir, "dir", "d", "testdata/tests", "directory containing .txtar tests")
+	pflag.StringVarP(&flags.TestDir, "dir", "d", "", "directory containing .txtar tests")
 	pflag.BoolVarP(&flags.Version, "version", "v", false, "display the application version and build info")
+	pflag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage: %s [DIR]\n\nFlags:\n", os.Args[0])
+		pflag.PrintDefaults()
+	}
 	pflag.Parse()
 
+	args := pflag.Args()
+	if len(args) > 0 {
+		flags.TestDir = args[0]
+	}
+
 	return flags
 }
 
@@ -32,8 +41,12 @@ func main() {
 		fmt.Println(version.GetVersionWithBuildInfo())
 		os.Exit(0)
 	}
+	if flags.TestDir == "" {
+		pflag.Usage()
+		os.Exit(0)
+	}
 
-	fmt.Printf("🚀 Starting E2E Test Suite on: %s\n", flags.TestDir)
+	fmt.Printf("Starting E2E Test Suite on: %s\n", flags.TestDir)
 	if err := runner.Run(flags.TestDir); err != nil {
 		fmt.Fprintf(os.Stderr, "❌ Error executing tests: %v\n", err)
 		os.Exit(1)

internal/runner/clitest.go

@@ -2,42 +2,100 @@ package runner
 
 import (
 	"fmt"
-	"os"
+	"runtime"
+	"sync"
 
 	"github.com/rogpeppe/go-internal/testscript"
 )
 
 type cliTest struct {
-	failed bool
+	mu      sync.Mutex
+	failed  bool
+	skipped bool
+	isSub   bool
+	parent  *cliTest
 }
 
-func (c *cliTest) Fatal(args ...any) {
-	c.failed = true
-	_, _ = fmt.Fprint(os.Stderr, "❌ ")
-	_, _ = fmt.Fprintln(os.Stderr, args...)
+func (t *cliTest) Run(name string, f func(t testscript.T)) {
+	subTest := &cliTest{
+		isSub:  true,
+		parent: t,
+	}
+
+	fmt.Printf("Running: %s\n", name)
+
+	done := make(chan struct{})
+	go func() {
+		defer close(done)
+		f(subTest)
+	}()
+	<-done
+
+	if subTest.failed {
+		t.mu.Lock()
+		t.failed = true
+		t.mu.Unlock()
+	}
 }
 
-func (c *cliTest) Log(args ...any) {
-	_, _ = fmt.Fprintln(os.Stdout, args...)
+func (t *cliTest) Fatal(args ...interface{}) {
+	t.mu.Lock()
+	t.failed = true
+	t.mu.Unlock()
+	fmt.Printf("🚨 Fatal error: %s\n", fmt.Sprint(args...))
+	if t.isSub {
+		runtime.Goexit()
+	}
 }
 
-func (c *cliTest) FailNow() {
-	c.failed = true
+func (t *cliTest) Log(args ...interface{}) {
+	if t.skipped {
+		fmt.Println()
+	} else {
+		fmt.Println(args...)
+	}
 }
 
-func (c *cliTest) Skip(args ...any) {
-	_, _ = fmt.Fprint(os.Stdout, "⏭️ Skipped: ")
-	_, _ = fmt.Fprintln(os.Stdout, args...)
+func (t *cliTest) Logf(format string, args ...interface{}) {
+	if t.skipped {
+		fmt.Println()
+	} else {
+		fmt.Printf(format+"\n", args...)
+	}
 }
 
-func (c *cliTest) Parallel() {
-	// No-op for CLI runner sequential runs
+func (t *cliTest) Skip(args ...interface{}) {
+	t.skipped = true
+	fmt.Printf("⚠️  Skipped: %s\n", fmt.Sprint(args...))
+	if t.isSub {
+		runtime.Goexit()
+	}
 }
 
-func (c *cliTest) Verbose() bool {
-	return true
+func (t *cliTest) Skipf(format string, args ...interface{}) {
+	t.skipped = true
+	fmt.Printf("⚠️  Skipped: %s\n", fmt.Sprintf(format, args...))
+	if t.isSub {
+		runtime.Goexit()
+	}
 }
 
-func (c *cliTest) Run(name string, f func(testscript.T)) {
-	f(c)
+func (t *cliTest) Errorf(format string, args ...interface{}) {
+	t.mu.Lock()
+	t.failed = true
+	t.mu.Unlock()
+	fmt.Printf("❌ "+format+"\n", args...)
 }
+
+func (t *cliTest) FailNow() {
+	t.mu.Lock()
+	t.failed = true
+	t.mu.Unlock()
+	if t.isSub {
+		runtime.Goexit()
+	}
+}
+
+func (t *cliTest) Parallel()     {}
+func (t *cliTest) Helper()       {}
+func (t *cliTest) Verbose() bool { return false }

internal/version/version.go

@@ -15,5 +15,5 @@ func GetVersion() string {
 }
 
 func GetVersionWithBuildInfo() string {
-	return fmt.Sprintf("Rivet %s\nCommit: %s\nBuilt:  %s", Version, CommitSHA, BuildTime)
+	return fmt.Sprintf("Rivet E2E: %s\nCommit:    %s\nBuilt:     %s", Version, CommitSHA, BuildTime)
 }