From 913465620b449a21ce1680740da1c20b7b430e2e Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Mon, 19 Mar 2018 17:12:04 +0000
Subject: [PATCH] Fix test logs appearing twice

---
 test/docker/docker_api_test_util.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/docker/docker_api_test_util.go b/test/docker/docker_api_test_util.go
index 5409b45..89dce1d 100644
--- a/test/docker/docker_api_test_util.go
+++ b/test/docker/docker_api_test_util.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -330,7 +329,7 @@ func execContainerWithOutput(t *testing.T, cli *client.Client, ID string, user s
 	// Each output line has a header, which needs to be removed
 	_, err = stdcopy.StdCopy(buf, buf, hijack.Reader)
 	if err != nil {
-		log.Fatal(err)
+		t.Fatal(err)
 	}
 	return strings.TrimSpace(buf.String())
 }
@@ -399,16 +398,15 @@ func inspectTextLogs(t *testing.T, cli *client.Client, ID string) string {
 	jsonLogs := inspectLogs(t, cli, ID)
 	scanner := bufio.NewScanner(strings.NewReader(jsonLogs))
 	b := make([]byte, 64*1024)
-	scanner.Buffer(b, 1024*1024)
 	buf := bytes.NewBuffer(b)
 	for scanner.Scan() {
-		t := scanner.Text()
-		if strings.HasPrefix(t, "{") {
+		text := scanner.Text()
+		if strings.HasPrefix(text, "{") {
 			var e map[string]interface{}
-			json.Unmarshal([]byte(scanner.Text()), &e)
+			json.Unmarshal([]byte(text), &e)
 			fmt.Fprintf(buf, "{\"message\": \"%v\"}\n", e["message"])
 		} else {
-			fmt.Fprintln(buf, t)
+			fmt.Fprintln(buf, text)
 		}
 	}
 	err := scanner.Err()
@@ -426,13 +424,13 @@ func inspectLogs(t *testing.T, cli *client.Client, ID string) string {
 		ShowStderr: true,
 	})
 	if err != nil {
-		log.Fatal(err)
+		t.Fatal(err)
 	}
 	buf := new(bytes.Buffer)
 	// Each output line has a header, which needs to be removed
 	_, err = stdcopy.StdCopy(buf, buf, reader)
 	if err != nil {
-		log.Fatal(err)
+		t.Fatal(err)
 	}
 	return buf.String()
 }