update failure case

internal/condition_reader/condition_reader.go

@@ -80,4 +80,4 @@ func (t *ConditionReader) ReadUntilTimeout(timeout time.Duration) ([]byte, error
 	}
 
 	return data, err
-}
+}

internal/shell_executable/shell_executable.go

@@ -1,11 +1,14 @@
 package shell_executable
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"regexp"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/codecrafters-io/shell-tester/internal/condition_reader"
@@ -18,6 +21,9 @@ import (
 // ErrConditionNotMet is re-exported from condition_reader for convenience
 var ErrConditionNotMet = condition_reader.ErrConditionNotMet
 
+// ErrProgramExited is returned when the program exits
+var ErrProgramExited = errors.New("Program exited")
+
 type ShellExecutable struct {
 	executable    *executable.Executable
 	logger        *logger.Logger
@@ -70,11 +76,21 @@ func (b *ShellExecutable) LogOutput(output []byte) {
 }
 
 func (b *ShellExecutable) ReadBytesUntil(condition func([]byte) bool) ([]byte, error) {
-	return b.ptyReader.ReadUntilCondition(condition)
+	readBytes, err := b.ptyReader.ReadUntilCondition(condition)
+	if err != nil {
+		return readBytes, wrapReaderError(err)
+	}
+
+	return readBytes, nil
 }
 
 func (b *ShellExecutable) ReadBytesUntilTimeout(timeout time.Duration) ([]byte, error) {
-	return b.ptyReader.ReadUntilTimeout(timeout)
+	readBytes, err := b.ptyReader.ReadUntilTimeout(timeout)
+	if err != nil {
+		return readBytes, wrapReaderError(err)
+	}
+
+	return readBytes, nil
 }
 
 func (b *ShellExecutable) SendCommand(command string) error {
@@ -159,3 +175,12 @@ func StripANSI(data []byte) []byte {
 
 	return re.ReplaceAll(data, []byte(""))
 }
+
+func wrapReaderError(readerErr error) error {
+	// Linux returns syscall.EIO when the process is killed, MacOS returns io.EOF
+	if errors.Is(readerErr, io.EOF) || errors.Is(readerErr, syscall.EIO) {
+		return ErrProgramExited
+	}
+
+	return readerErr
+}

internal/stage4.go

@@ -1,12 +1,9 @@
 package internal
 
 import (
-	"errors"
 	"fmt"
-	"io"
 	"regexp"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/codecrafters-io/shell-tester/internal/shell_executable"
@@ -54,13 +51,11 @@ func testExit(stageHarness *test_case_harness.TestCaseHarness) error {
 	}
 
 	// We're expecting EOF since the program should've terminated
-	// HACK: We also allow syscall.EIO since that's what we get on Linux when the process is killed
-	// read /dev/ptmx: input/output error *fs.PathError
-	if !errors.Is(readErr, io.EOF) && !errors.Is(readErr, syscall.EIO) {
+	if readErr != shell_executable.ErrProgramExited {
 		if readErr == nil {
 			return fmt.Errorf("Expected program to exit with 0 exit code, program is still running.")
 		} else {
-			// TODO: Other than EOF, what other errors could we get? Are they user errors or internal errors?
+			// TODO: Other than ErrProgramExited, what other errors could we get? Are they user errors or internal errors?
 			return fmt.Errorf("Error reading output: %v", readErr)
 		}
 	}

internal/stages_test.go

@@ -26,6 +26,13 @@ func TestStages(t *testing.T) {
 			StdoutFixturePath:   "./test_helpers/fixtures/navigation/pass",
 			NormalizeOutputFunc: normalizeTesterOutput,
 		},
+		"missing_command_fail": {
+			UntilStageSlug:      "cz2",
+			CodePath:            "./test_helpers/scenarios/missing_command/wrong_output",
+			ExpectedExitCode:    1,
+			StdoutFixturePath:   "./test_helpers/fixtures/missing_command/wrong_output",
+			NormalizeOutputFunc: normalizeTesterOutput,
+		},
 	}
 
 	testerUtilsTesting.TestTesterOutput(t, testerDefinition, testCases)

internal/test_cases/regex_test_case.go

@@ -52,10 +52,11 @@ func (t RegexTestCase) Run(shell *shell_executable.ShellExecutable, logger *logg
 	}
 
 	if err != nil {
-		if errors.Is(err, shell_executable.ErrConditionNotMet) {
+		if errors.Is(err, shell_executable.ErrConditionNotMet) || errors.Is(err, shell_executable.ErrProgramExited) {
 			logger.Errorf("Expected output to %s, got %q", t.ExpectedPatternExplanation, string(shell_executable.StripANSI(output)))
 		}
 
+		// TODO: Think about this, what other errors could be there other than ErrConditionNotMet and ErrProgramExited?
 		return err
 	}
 

internal/test_helpers/fixtures/missing_command/wrong_output

@@ -0,0 +1,10 @@
+Debug = true
+
+[stage-2] Running tests for Stage #2: cz2
+[stage-2] Running ./your_shell.sh
+[your-program] $ 
+[stage-2] > nonexistent
+[your-program] Command: nonexistent
+[stage-2] Expected output to contain "nonexistent: command not found", got "Command: nonexistent\r\n"
+[stage-2] Program exited
+[stage-2] Test failed

internal/test_helpers/scenarios/missing_command/wrong_output/main.py

@@ -0,0 +1,16 @@
+import sys
+
+
+def main():
+    sys.stdout.write("$ ")
+    sys.stdout.flush()
+
+    command = input()
+
+    # Wrong output
+    sys.stdout.write(f"Command: {command}\n")
+    sys.stdout.flush()
+
+
+if __name__ == "__main__":
+    main()

internal/test_helpers/scenarios/missing_command/wrong_output/your_shell.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# DON'T EDIT THIS!
+#
+# CodeCrafters uses this file to test your code. Don't make any changes here!
+#
+# DON'T EDIT THIS!
+exec python3 $(dirname "$0")/main.py "$@"