Merge pull request #12199 from ptabor/20200803-expect-replace-fix

tests/e2e: Update github.com/creack/pty v1.1.7 -> v1.1.11

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa
 	github.com/coreos/go-semver v0.2.0
 	github.com/coreos/go-systemd/v22 v22.0.0
-	github.com/creack/pty v1.1.7
+	github.com/creack/pty v1.1.11
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
 	github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca

go.sum

@@ -19,6 +19,8 @@ github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQa
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/expect/expect.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // Package expect implements a small expect-style interface
+// TODO(ptab): Consider migration to https://github.com/google/goexpect.
 package expect
 
 import (

vendor/github.com/creack/pty/Dockerfile.riscv

@@ -1,4 +1,4 @@
-FROM golang:1.12
+FROM golang:1.13
 
 # Clone and complie a riscv compatible version of the go compiler.
 RUN git clone https://review.gerrithub.io/riscv/riscv-go /riscv-go

vendor/github.com/creack/pty/go.mod

@@ -0,0 +1,4 @@
+module github.com/creack/pty
+
+go 1.13
+

vendor/github.com/creack/pty/run.go

@@ -11,6 +11,8 @@ import (
 // Start assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
 // and c.Stderr, calls c.Start, and returns the File of the tty's
 // corresponding pty.
+//
+// Starts the process in a new session and sets the controlling terminal.
 func Start(c *exec.Cmd) (pty *os.File, err error) {
 	return StartWithSize(c, nil)
 }
@@ -19,16 +21,35 @@ func Start(c *exec.Cmd) (pty *os.File, err error) {
 // and c.Stderr, calls c.Start, and returns the File of the tty's
 // corresponding pty.
 //
-// This will resize the pty to the specified size before starting the command
+// This will resize the pty to the specified size before starting the command.
+// Starts the process in a new session and sets the controlling terminal.
 func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) {
+	if c.SysProcAttr == nil {
+		c.SysProcAttr = &syscall.SysProcAttr{}
+	}
+	c.SysProcAttr.Setsid = true
+	c.SysProcAttr.Setctty = true
+	return StartWithAttrs(c, sz, c.SysProcAttr)
+}
+
+// StartWithAttrs assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
+// and c.Stderr, calls c.Start, and returns the File of the tty's
+// corresponding pty.
+//
+// This will resize the pty to the specified size before starting the command if a size is provided.
+// The `attrs` parameter overrides the one set in c.SysProcAttr.
+//
+// This should generally not be needed. Used in some edge cases where it is needed to create a pty
+// without a controlling terminal.
+func StartWithAttrs(c *exec.Cmd, sz *Winsize, attrs *syscall.SysProcAttr) (pty *os.File, err error) {
 	pty, tty, err := Open()
 	if err != nil {
 		return nil, err
 	}
 	defer tty.Close()
+
 	if sz != nil {
-		err = Setsize(pty, sz)
+		if err := Setsize(pty, sz); err != nil {
-		if err != nil {
 			pty.Close()
 			return nil, err
 		}
@@ -42,15 +63,11 @@ func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) {
 	if c.Stdin == nil {
 		c.Stdin = tty
 	}
-	if c.SysProcAttr == nil {
+
-		c.SysProcAttr = &syscall.SysProcAttr{}
+	c.SysProcAttr = attrs
-	}
+
-	c.SysProcAttr.Setctty = true
+	if err := c.Start(); err != nil {
-	c.SysProcAttr.Setsid = true
+		_ = pty.Close()
-	c.SysProcAttr.Ctty = int(tty.Fd())
-	err = c.Start()
-	if err != nil {
-		pty.Close()
 		return nil, err
 	}
 	return pty, err

vendor/github.com/creack/pty/test_crosscompile.sh

@@ -29,7 +29,7 @@ cross linux     amd64 386 arm arm64 ppc64 ppc64le s390x mips mipsle mips64 mips6
 cross darwin    amd64 386 arm arm64
 cross freebsd   amd64 386 arm
 cross netbsd    amd64 386 arm
-cross openbsd   amd64 386
+cross openbsd   amd64 386 arm arm64
 cross dragonfly amd64
 cross solaris   amd64
 

vendor/github.com/creack/pty/ztypes_freebsd_arm64.go

@@ -0,0 +1,13 @@
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs types_freebsd.go
+
+package pty
+
+const (
+	_C_SPECNAMELEN = 0xff
+)
+
+type fiodgnameArg struct {
+	Len int32
+	Buf *byte
+}

vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go

@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
+// +build openbsd
-// cgo -godefs types_openbsd.go
+// +build 386 amd64 arm arm64
 
 package pty
 

vendor/github.com/creack/pty/ztypes_openbsd_amd64.go

@@ -1,13 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
-
-package pty
-
-type ptmget struct {
-	Cfd int32
-	Sfd int32
-	Cn  [16]int8
-	Sn  [16]int8
-}
-
-var ioctl_PTMGET = 0x40287401

vendor/modules.txt

@@ -13,7 +13,7 @@ github.com/coreos/go-semver/semver
 ## explicit
 github.com/coreos/go-systemd/v22/daemon
 github.com/coreos/go-systemd/v22/journal
-# github.com/creack/pty v1.1.7
+# github.com/creack/pty v1.1.11
 ## explicit
 github.com/creack/pty
 # github.com/dgrijalva/jwt-go v3.2.0+incompatible