veyron/tools/naming/simulator/testdata: fix use of ErrorOutput
Change-Id: Ia3dc539542687e61d8fc3a733cc245c7176f6ac6
diff --git a/tools/naming/simulator/testdata/integration_test.go b/tools/naming/simulator/testdata/integration_test.go
index 9cee3bf..be038a7 100644
--- a/tools/naming/simulator/testdata/integration_test.go
+++ b/tools/naming/simulator/testdata/integration_test.go
@@ -1,6 +1,8 @@
package testdata
import (
+ "bufio"
+ "bytes"
"fmt"
"io/ioutil"
"os"
@@ -34,8 +36,10 @@
}
for _, script := range scripts {
invocation := binary.Start("--file", script)
- output, errorOutput := invocation.Output(), invocation.ErrorOutput()
- if err := invocation.Wait(nil, nil); err != nil {
+ output := invocation.Output()
+ var buf bytes.Buffer
+ if err := invocation.Wait(nil, bufio.NewWriter(&buf)); err != nil {
+ errorOutput := string(buf.Bytes())
fmt.Fprintf(os.Stderr, "Script %v failed\n", script)
fmt.Fprintln(os.Stderr, output)
fmt.Fprintln(os.Stderr, errorOutput)
