From 61b2a90aefee82da19ea5b388fb6112760833d97 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Tue, 24 Jun 2025 18:29:13 +0300
Subject: Fix dcat tests for server mode and --plain flag handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update dcat tests to use comma-separated file lists in server mode
- Fix basehandler.go to properly respect --plain flag for server messages
- Skip empty server messages when in plain mode
- Add separate expected output file for TestDCatColors server mode
- All dcat integration tests now pass in both serverless and server modes

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 integrationtests-old/commandutils.go | 154 +++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 integrationtests-old/commandutils.go

(limited to 'integrationtests-old/commandutils.go')

diff --git a/integrationtests-old/commandutils.go b/integrationtests-old/commandutils.go
new file mode 100644
index 0000000..8d81955
--- /dev/null
+++ b/integrationtests-old/commandutils.go
@@ -0,0 +1,154 @@
+package integrationtests
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+	"syscall"
+	"testing"
+	"time"
+)
+
+func runCommand(ctx context.Context, t *testing.T, stdoutFile, cmdStr string,
+	args ...string) (int, error) {
+
+	if _, err := os.Stat(cmdStr); err != nil {
+		return 0, fmt.Errorf("no such executable '%s', please compile first: %w", cmdStr, err)
+	}
+
+	t.Log("Creating stdout file", stdoutFile)
+	fd, err := os.Create(stdoutFile)
+	if err != nil {
+		return 0, nil
+	}
+	defer fd.Close()
+
+	t.Log("Running command", cmdStr, strings.Join(args, " "))
+	cmd := exec.CommandContext(ctx, cmdStr, args...)
+	out, err := cmd.CombinedOutput()
+	t.Log("Done running command!", err)
+	_, _ = fd.Write(out)
+
+	return exitCodeFromError(err), err
+}
+
+func runCommandRetry(ctx context.Context, t *testing.T, retries int, stdoutFile,
+	cmd string, args ...string) (exitCode int, err error) {
+
+	for i := 0; i < retries; i++ {
+		time.Sleep(time.Second)
+		if exitCode, err = runCommand(ctx, t, stdoutFile, cmd, args...); exitCode == 0 {
+			return
+		}
+	}
+	return
+}
+
+func startCommand(ctx context.Context, t *testing.T, inPipeFile,
+	cmdStr string, args ...string) (<-chan string, <-chan string, <-chan error, error) {
+
+	stdoutCh := make(chan string)
+	stderrCh := make(chan string)
+
+	if _, err := os.Stat(cmdStr); err != nil {
+		return stdoutCh, stderrCh, nil,
+			fmt.Errorf("no such executable '%s', please compile first: %w", cmdStr, err)
+	}
+
+	t.Log(cmdStr, strings.Join(args, " "))
+	cmd := exec.CommandContext(ctx, cmdStr, args...)
+
+	var stdinPipe io.WriteCloser
+	if inPipeFile != "" {
+		var err error
+		stdinPipe, err = cmd.StdinPipe()
+		if err != nil {
+			return stdoutCh, stderrCh, nil, err
+		}
+	}
+	cmdStdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return stdoutCh, stderrCh, nil, err
+	}
+	cmdStderr, err := cmd.StderrPipe()
+	if err != nil {
+		return stdoutCh, stderrCh, nil, err
+	}
+	err = cmd.Start()
+	if err != nil {
+		return stdoutCh, stderrCh, nil, err
+	}
+
+	// Read input file and send to stdin pipe?
+	if inPipeFile != "" {
+		t.Logf("Piping %s to stdin pipe", inPipeFile)
+		fd, err := os.Open(inPipeFile)
+		if err != nil {
+			return stdoutCh, stderrCh, nil, err
+		}
+		go func() {
+			_, _ = io.Copy(stdinPipe, bufio.NewReader(fd))
+			stdinPipe.Close()
+			fd.Close()
+		}()
+	}
+
+	go func() {
+		scanner := bufio.NewScanner(cmdStdout)
+		scanner.Split(bufio.ScanLines)
+		for scanner.Scan() {
+			stdoutCh <- scanner.Text()
+		}
+	}()
+	go func() {
+		scanner := bufio.NewScanner(cmdStderr)
+		scanner.Split(bufio.ScanLines)
+		for scanner.Scan() {
+			stderrCh <- scanner.Text()
+		}
+		close(stderrCh)
+	}()
+
+	cmdErrCh := make(chan error)
+	go func() {
+		cmdErrCh <- cmd.Wait()
+	}()
+
+	return stdoutCh, stderrCh, cmdErrCh, nil
+}
+
+func waitForCommand(ctx context.Context, t *testing.T,
+	stdoutCh, stderrCh <-chan string, cmdErrCh <-chan error) {
+
+	for {
+		select {
+		case line, ok := <-stdoutCh:
+			if ok {
+				t.Log(line)
+			}
+		case line, ok := <-stderrCh:
+			if ok {
+				t.Log(line)
+			}
+		case cmdErr := <-cmdErrCh:
+			t.Logf("Command finished with with exit code %d: %v",
+				exitCodeFromError(cmdErr), cmdErr)
+			return
+		}
+	}
+}
+
+func exitCodeFromError(err error) int {
+	if err == nil {
+		return 0
+	}
+	if exitError, ok := err.(*exec.ExitError); ok {
+		ws := exitError.Sys().(syscall.WaitStatus)
+		return ws.ExitStatus()
+	}
+	panic(fmt.Errorf("Unable to get process exit code from error: %w", err))
+}
-- 
cgit v1.2.3