@@ -1,12 +1,18 @@

 package main

 import (

+	"bufio"

 	"fmt"

+	"io/ioutil"

+	"os"

 	"os/exec"

 	"strconv"

 	"strings"

 	"testing"

 	"time"

+	"unicode"

+

+	"github.com/kr/pty"

 )

 func TestEventsUntag(t *testing.T) {

@@ -166,3 +172,46 @@ func TestEventsImageUntagDelete(t *testing.T) {

 	}

 	logDone("events - image untag, delete is logged")

 }

+

+// #5979

+func TestEventsRedirectStdout(t *testing.T) {

+

+	since := time.Now().Unix()

+

+	cmd(t, "run", "busybox", "true")

+

+	defer deleteAllContainers()

+

+	file, err := ioutil.TempFile("", "")

+	if err != nil {

+		t.Fatalf("could not create temp file: %v", err)

+	}

+	defer os.Remove(file.Name())

+

+	command := fmt.Sprintf("%s events --since=%d --until=%d > %s", dockerBinary, since, time.Now().Unix(), file.Name())

+	_, tty, err := pty.Open()

+	if err != nil {

+		t.Fatalf("Could not open pty: %v", err)

+	}

+	cmd := exec.Command("sh", "-c", command)

+	cmd.Stdin = tty

+	cmd.Stdout = tty

+	cmd.Stderr = tty

+	if err := cmd.Run(); err != nil {

+		t.Fatalf("run err for command %q: %v", command, err)

+	}

+

+	scanner := bufio.NewScanner(file)

+	for scanner.Scan() {

+		for _, c := range scanner.Text() {

+			if unicode.IsControl(c) {

+				t.Fatalf("found control character %v", []byte(string(c)))

+			}

+		}

+	}

+	if err := scanner.Err(); err != nil {

+		t.Fatalf("Scan err for command %q: %v", command, err)

+	}

+

+	logDone("events - redirect stdout")

+}

@@ -19,6 +19,7 @@ import (

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/pkg/networkfs/resolvconf"

+	"github.com/kr/pty"

 )

 // "test123" should be printed by docker run

@@ -2162,3 +2163,41 @@ func TestRunExecDir(t *testing.T) {

 	logDone("run - check execdriver dir behavior")

 }

+

+// #6509

+func TestRunRedirectStdout(t *testing.T) {

+

+	defer deleteAllContainers()

+

+	checkRedirect := func(command string) {

+		_, tty, err := pty.Open()

+		if err != nil {

+			t.Fatalf("Could not open pty: %v", err)

+		}

+		cmd := exec.Command("sh", "-c", command)

+		cmd.Stdin = tty

+		cmd.Stdout = tty

+		cmd.Stderr = tty

+		ch := make(chan struct{})

+		if err := cmd.Start(); err != nil {

+			t.Fatalf("start err: %v", err)

+		}

+		go func() {

+			if err := cmd.Wait(); err != nil {

+				t.Fatalf("wait err=%v", err)

+			}

+			close(ch)

+		}()

+

+		select {

+		case <-time.After(time.Second):

+			t.Fatal("command timeout")

+		case <-ch:

+		}

+	}

+

+	checkRedirect(dockerBinary + " run -i busybox cat /etc/passwd | grep -q root")

+	checkRedirect(dockerBinary + " run busybox cat /etc/passwd | grep -q root")

+

+	logDone("run - redirect stdout")

+}