Pārlūkot izejas kodu

remove integration/utils setRaw funcs

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff 10 gadi atpakaļ
vecāks
revīzija
63331abbca
2 mainītis faili ar 0 papildinājumiem un 30 dzēšanām
  1. 0 9
      daemon/container.go
  2. 0 21
      integration/utils.go

+ 0 - 9
daemon/container.go

@@ -14,7 +14,6 @@ import (
 	"syscall"
 	"syscall"
 	"time"
 	"time"
 
 
-	"github.com/docker/libcontainer"
 	"github.com/docker/libcontainer/configs"
 	"github.com/docker/libcontainer/configs"
 	"github.com/docker/libcontainer/devices"
 	"github.com/docker/libcontainer/devices"
 	"github.com/docker/libcontainer/label"
 	"github.com/docker/libcontainer/label"
@@ -1020,14 +1019,6 @@ func (container *Container) Exposes(p nat.Port) bool {
 	return exists
 	return exists
 }
 }
 
 
-func (container *Container) GetPtyMaster() (libcontainer.Console, error) {
-	ttyConsole, ok := container.command.ProcessConfig.Terminal.(execdriver.TtyTerminal)
-	if !ok {
-		return nil, ErrNoTTY
-	}
-	return ttyConsole.Master(), nil
-}
-
 func (container *Container) HostConfig() *runconfig.HostConfig {
 func (container *Container) HostConfig() *runconfig.HostConfig {
 	container.Lock()
 	container.Lock()
 	res := container.hostConfig
 	res := container.hostConfig

+ 0 - 21
integration/utils.go

@@ -9,7 +9,6 @@ import (
 	"time"
 	"time"
 
 
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/pkg/term"
 )
 )
 
 
 func closeWrap(args ...io.Closer) error {
 func closeWrap(args ...io.Closer) error {
@@ -27,26 +26,6 @@ func closeWrap(args ...io.Closer) error {
 	return nil
 	return nil
 }
 }
 
 
-func setRaw(t *testing.T, c *daemon.Container) *term.State {
-	pty, err := c.GetPtyMaster()
-	if err != nil {
-		t.Fatal(err)
-	}
-	state, err := term.MakeRaw(pty.Fd())
-	if err != nil {
-		t.Fatal(err)
-	}
-	return state
-}
-
-func unsetRaw(t *testing.T, c *daemon.Container, state *term.State) {
-	pty, err := c.GetPtyMaster()
-	if err != nil {
-		t.Fatal(err)
-	}
-	term.RestoreTerminal(pty.Fd(), state)
-}
-
 func waitContainerStart(t *testing.T, timeout time.Duration) *daemon.Container {
 func waitContainerStart(t *testing.T, timeout time.Duration) *daemon.Container {
 	var container *daemon.Container
 	var container *daemon.Container