Merge pull request #10 from gdt-dev/issue-8

call t.Error() from sub-tests not Scenario.Run()

Author: jaypipes

errors/failure.go

@@ -31,8 +31,15 @@ var (
 )
 
 // TimeoutExceeded returns an ErrTimeoutExceeded when a test's execution
-// exceeds a timeout length.
-func TimeoutExceeded(duration string) error {
+// exceeds a timeout length. The optional failure parameter indicates a failed
+// assertion that occurred before a timeout was reached.
+func TimeoutExceeded(duration string, failure error) error {
+	if failure != nil {
+		return fmt.Errorf(
+			"%w: timed out waiting for assertion to succeed (%s)",
+			failure, duration,
+		)
+	}
 	return fmt.Errorf("%s (%s)", ErrTimeoutExceeded, duration)
 }
 

plugin/exec/eval.go

@@ -71,6 +71,11 @@ func (s *Spec) Eval(ctx context.Context, t *testing.T) *result.Result {
 		eerr, _ := err.(*exec.ExitError)
 		ec = eerr.ExitCode()
 	}
-	assertions := newAssertions(s.Assert, ec, outbuf, errbuf)
-	return result.New(result.WithFailures(assertions.Failures()...))
+	a := newAssertions(s.Assert, ec, outbuf, errbuf)
+	if !a.OK() {
+		for _, fail := range a.Failures() {
+			t.Error(fail)
+		}
+	}
+	return result.New(result.WithFailures(a.Failures()...))
 }

scenario/run.go

@@ -83,6 +83,7 @@ func (s *Scenario) Run(ctx context.Context, t *testing.T) error {
 			res := spec.Eval(specCtx, t)
 			if res.HasRuntimeError() {
 				rterr = res.RuntimeError()
+				t.Fatal(rterr)
 				break
 			}
 			// Results can have arbitrary run data stored in them and we
@@ -91,15 +92,6 @@ func (s *Scenario) Run(ctx context.Context, t *testing.T) error {
 			if res.HasData() {
 				ctx = gdtcontext.StorePriorRun(ctx, res.Data())
 			}
-			for _, failure := range res.Failures() {
-				if gdtcontext.TimedOut(specCtx, failure) {
-					if to != nil && !to.Expected {
-						t.Fatal(gdterrors.TimeoutExceeded(to.After))
-					}
-				} else {
-					t.Fatal(failure)
-				}
-			}
 			if wait != nil && wait.After != "" {
 				debug.Println(ctx, t, "wait: %s after", wait.After)
 				time.Sleep(wait.AfterDuration())