better error msg

Author: Arpan-206

internal/shell_executable/shell_executable.go

@@ -104,12 +104,38 @@ func (b *ShellExecutable) VTBellChannel() chan bool {
 func (b *ShellExecutable) ReadUntilConditionOrTimeout(condition func() bool, timeout time.Duration) error {
 	err := b.ptyReader.ReadUntilConditionOrTimeout(condition, timeout)
 	if err != nil {
-		return wrapReaderError(err)
-	}
+		// First log any remaining output
+		state := b.vt.GetScreenState()
+		for _, row := range state {
+			output := virtual_terminal.BuildCleanedRow(row)
+			if len(output) > 0 {
+				b.programLogger.Plainln(output)
+			}
+		}
 
+		// Then return error message
+		if errors.Is(err, io.EOF) || errors.Is(err, syscall.EIO) {
+			return ErrProgramExited
+		}
+		if errors.Is(err, condition_reader.ErrConditionNotMet) {
+			return fmt.Errorf("the 'exit' command should terminate your shell, but your shell is still running")
+		}
+		return err
+	}
 	return nil
 }
 
+func (b *ShellExecutable) LogRemainingOutput() {
+	// Get any remaining output from the virtual terminal
+	state := b.vt.GetScreenState()
+	for _, row := range state {
+		output := virtual_terminal.BuildCleanedRow(row)
+		if len(output) > 0 {
+			b.LogOutput([]byte(output))
+		}
+	}
+}
+
 func (b *ShellExecutable) SendCommand(command string) error {
 	if err := b.SendCommandRaw(command + "\n"); err != nil {
 		return err

internal/stage4.go

@@ -49,7 +49,7 @@ func testExit(stageHarness *test_case_harness.TestCaseHarness) error {
 			return fmt.Errorf("Expected program to exit with 0 exit code, program is still running.")
 		} else {
 			// 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)
+			return fmt.Errorf("Error: %v", readErr)
 		}
 	}