Fixes #39: Crash on syntax error output after legitimate output + go-…

…acc compatibility
GoTestTools · Apr 18, 2022 · 80c7114 · 80c7114
1 parent d03e223
commit 80c7114
Show file tree

Hide file tree

Showing 8 changed files with 270 additions and 0 deletions.
diff --git a/parser/parse.go b/parser/parse.go
@@ -159,6 +159,8 @@ func parse(
 						pkgTracker.AddOutput(prevErroredPkg, "", evt.Output)
 					} else if !outputStarted {
 						prefixChannel <- string(evt.Output)
+					} else if strings.HasPrefix(string(evt.Output), "exit status ") {
+						// Ignore go-acc exit status reporting.
 					} else {
 						panic(
 							fmt.Errorf(

diff --git a/testdata/go-acc.parser.json b/testdata/go-acc.parser.json
@@ -0,0 +1,36 @@
+{
+  "prefix": null,
+  "downloads": {
+    "packages": null,
+    "failed": false,
+    "reason": ""
+  },
+  "packages": [
+    {
+      "name": "github.com/haveyoudebuggedit/example",
+      "result": "FAIL",
+      "duration": "0s",
+      "coverage": null,
+      "output": "nothing_test.go:7:11: expected '(', found Nothing",
+      "testcases": null,
+      "reason": "setup failed"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/example/second",
+      "result": "PASS",
+      "duration": "2ms",
+      "coverage": null,
+      "output": "",
+      "testcases": [
+        {
+          "name": "TestNothing",
+          "result": "PASS",
+          "duration": "0s",
+          "coverage": null,
+          "output": ""
+        }
+      ],
+      "reason": ""
+    }
+  ]
+}
diff --git a/testdata/go-acc.tokenizer.json b/testdata/go-acc.tokenizer.json
@@ -0,0 +1,90 @@
+[
+  {
+    "action": "run",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "TestNothing",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "TestNothing",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass-final",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "",
+    "elapsed": "2ms",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "package",
+    "package": "github.com/haveyoudebuggedit/example",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": false
+  },
+  {
+    "action": "stdout",
+    "package": "",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm90aGluZ190ZXN0LmdvOjc6MTE6IGV4cGVjdGVkICcoJywgZm91bmQgTm90aGluZw==",
+    "cached": false,
+    "coverage": null,
+    "json": false
+  },
+  {
+    "action": "fail",
+    "package": "github.com/haveyoudebuggedit/example",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "c2V0dXAgZmFpbGVk",
+    "cached": false,
+    "coverage": null,
+    "json": false
+  },
+  {
+    "action": "stdout",
+    "package": "",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "ZXhpdCBzdGF0dXMgMQ==",
+    "cached": false,
+    "coverage": null,
+    "json": false
+  }
+]
diff --git a/testdata/go-acc.txt b/testdata/go-acc.txt
@@ -0,0 +1,11 @@
+{"Time":"2021-11-27T10:23:01.309620888+01:00","Action":"run","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing"}
+{"Time":"2021-11-27T10:23:01.309734731+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Output":"=== RUN   TestNothing\n"}
+{"Time":"2021-11-27T10:23:01.3097659+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Output":"--- PASS: TestNothing (0.00s)\n"}
+{"Time":"2021-11-27T10:23:01.309786588+01:00","Action":"pass","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Elapsed":0}
+{"Time":"2021-11-27T10:23:01.309799132+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Output":"PASS\n"}
+{"Time":"2021-11-27T10:23:01.309994377+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Output":"ok  \tgithub.com/haveyoudebuggedit/example/second\t0.002s\n"}
+{"Time":"2021-11-27T10:23:01.310211915+01:00","Action":"pass","Package":"github.com/haveyoudebuggedit/example/second","Elapsed":0.002}
+# github.com/haveyoudebuggedit/example
+nothing_test.go:7:11: expected '(', found Nothing
+FAIL    github.com/haveyoudebuggedit/example [setup failed]
+exit status 1
diff --git a/testdata/multipackage-syntax-reverse.parser.json b/testdata/multipackage-syntax-reverse.parser.json
@@ -0,0 +1,36 @@
+{
+  "prefix": null,
+  "downloads": {
+    "packages": null,
+    "failed": false,
+    "reason": ""
+  },
+  "packages": [
+    {
+      "name": "github.com/haveyoudebuggedit/example",
+      "result": "FAIL",
+      "duration": "0s",
+      "coverage": null,
+      "output": "nothing_test.go:7:11: expected '(', found Nothing",
+      "testcases": null,
+      "reason": "setup failed"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/example/second",
+      "result": "PASS",
+      "duration": "2ms",
+      "coverage": null,
+      "output": "",
+      "testcases": [
+        {
+          "name": "TestNothing",
+          "result": "PASS",
+          "duration": "0s",
+          "coverage": null,
+          "output": ""
+        }
+      ],
+      "reason": ""
+    }
+  ]
+}
diff --git a/testdata/multipackage-syntax-reverse.tokenizer.json b/testdata/multipackage-syntax-reverse.tokenizer.json
@@ -0,0 +1,79 @@
+[
+  {
+    "action": "run",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "TestNothing",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "TestNothing",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass-final",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/example/second",
+    "version": "",
+    "test": "",
+    "elapsed": "2ms",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": true
+  },
+  {
+    "action": "package",
+    "package": "github.com/haveyoudebuggedit/example",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": false,
+    "coverage": null,
+    "json": false
+  },
+  {
+    "action": "stdout",
+    "package": "",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm90aGluZ190ZXN0LmdvOjc6MTE6IGV4cGVjdGVkICcoJywgZm91bmQgTm90aGluZw==",
+    "cached": false,
+    "coverage": null,
+    "json": false
+  },
+  {
+    "action": "fail",
+    "package": "github.com/haveyoudebuggedit/example",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "c2V0dXAgZmFpbGVk",
+    "cached": false,
+    "coverage": null,
+    "json": false
+  }
+]
diff --git a/testdata/multipackage-syntax-reverse.txt b/testdata/multipackage-syntax-reverse.txt
@@ -0,0 +1,10 @@
+{"Time":"2021-11-27T10:23:01.309620888+01:00","Action":"run","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing"}
+{"Time":"2021-11-27T10:23:01.309734731+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Output":"=== RUN   TestNothing\n"}
+{"Time":"2021-11-27T10:23:01.3097659+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Output":"--- PASS: TestNothing (0.00s)\n"}
+{"Time":"2021-11-27T10:23:01.309786588+01:00","Action":"pass","Package":"github.com/haveyoudebuggedit/example/second","Test":"TestNothing","Elapsed":0}
+{"Time":"2021-11-27T10:23:01.309799132+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Output":"PASS\n"}
+{"Time":"2021-11-27T10:23:01.309994377+01:00","Action":"output","Package":"github.com/haveyoudebuggedit/example/second","Output":"ok  \tgithub.com/haveyoudebuggedit/example/second\t0.002s\n"}
+{"Time":"2021-11-27T10:23:01.310211915+01:00","Action":"pass","Package":"github.com/haveyoudebuggedit/example/second","Elapsed":0.002}
+# github.com/haveyoudebuggedit/example
+nothing_test.go:7:11: expected '(', found Nothing
+FAIL    github.com/haveyoudebuggedit/example [setup failed]
diff --git a/tokenizer/tokenizer.go b/tokenizer/tokenizer.go
@@ -54,6 +54,12 @@ var stateMachine = []stateChange{
 		ActionPackage,
 		stateBetweenTests,
 	},
+	{
+		regexp.MustCompile(`^# (?P<Package>.*)$`),
+		stateBetweenTests,
+		ActionPackage,
+		stateBetweenTests,
+	},
 	{
 		regexp.MustCompile(`^=== RUN\s+(?P<Test>.*)$`),
 		stateInit,