Remove more unused options

bryphe-coder · bryphe-coder · commit 5cba77de6e68 · 2022-02-14T22:27:53.000Z
diff --git a/expect/console.go b/expect/console.go
@@ -45,9 +45,7 @@ type ConsoleOpt func(*ConsoleOpts) error
 type ConsoleOpts struct {
 	Logger          *log.Logger
 	Stdouts         []io.Writer
-	Closers         []io.Closer
 	ExpectObservers []Observer
-	SendObservers   []SendObserver
 }
 
 // Observer provides an interface for a function callback that will
@@ -58,13 +56,6 @@ type ConsoleOpts struct {
 // err is error that might have occurred. May be nil.
 type Observer func(matchers []Matcher, buf string, err error)
 
-// SendObserver provides an interface for a function callback that will
-// be called after each Send operation.
-// msg is the string that was sent.
-// num is the number of bytes actually sent.
-// err is the error that might have occurred.  May be nil.
-type SendObserver func(msg string, num int, err error)
-
 // WithStdout adds writers that Console duplicates writes to, similar to the
 // Unix tee(1) command.
 //
@@ -79,14 +70,6 @@ func WithStdout(writers ...io.Writer) ConsoleOpt {
 	}
 }
 
-// WithCloser adds closers that are closed in order when Console is closed.
-func WithCloser(closer ...io.Closer) ConsoleOpt {
-	return func(opts *ConsoleOpts) error {
-		opts.Closers = append(opts.Closers, closer...)
-		return nil
-	}
-}
-
 // WithLogger adds a logger for Console to log debugging information to. By
 // default Console will discard logs.
 func WithLogger(logger *log.Logger) ConsoleOpt {
@@ -104,14 +87,6 @@ func WithExpectObserver(observers ...Observer) ConsoleOpt {
 	}
 }
 
-// WithSendObserver adds a SendObserver to allow monitoring Send operations.
-func WithSendObserver(observers ...SendObserver) ConsoleOpt {
-	return func(opts *ConsoleOpts) error {
-		opts.SendObservers = append(opts.SendObservers, observers...)
-		return nil
-	}
-}
-
 // NewConsole returns a new Console with the given options.
 func NewConsole(opts ...ConsoleOpt) (*Console, error) {
 	options := ConsoleOpts{
@@ -128,7 +103,7 @@ func NewConsole(opts ...ConsoleOpt) (*Console, error) {
 	if err != nil {
 		return nil, err
 	}
-	closers := append(options.Closers, consolePty)
+	closers := []io.Closer{consolePty}
 	reader := consolePty.Reader()
 
 	passthroughPipe, err := NewPassthroughPipe(reader)
@@ -173,9 +148,6 @@ func (c *Console) Close() error {
 func (c *Console) Send(s string) (int, error) {
 	c.Logf("console send: %q", s)
 	n, err := c.pty.WriteString(s)
-	for _, observer := range c.opts.SendObservers {
-		observer(s, n, err)
-	}
 	return n, err
 }
 
diff --git a/expect/expect_test.go b/expect/expect_test.go
@@ -74,7 +74,6 @@ func Prompt(in io.Reader, out io.Writer) error {
 func newTestConsole(t *testing.T, opts ...ConsoleOpt) (*Console, error) {
 	opts = append([]ConsoleOpt{
 		expectNoError(t),
-		sendNoError(t),
 	}, opts...)
 	return NewTestConsole(t, opts...)
 }
@@ -98,19 +97,6 @@ func expectNoError(t *testing.T) ConsoleOpt {
 	)
 }
 
-func sendNoError(t *testing.T) ConsoleOpt {
-	return WithSendObserver(
-		func(msg string, n int, err error) {
-			if err != nil {
-				t.Fatalf("Failed to send %q: %s\n%s", msg, err, string(debug.Stack()))
-			}
-			if len(msg) != n {
-				t.Fatalf("Only sent %d of %d bytes for %q\n%s", n, len(msg), msg, string(debug.Stack()))
-			}
-		},
-	)
-}
-
 func testCloser(t *testing.T, closer io.Closer) {
 	if err := closer.Close(); err != nil {
 		t.Errorf("Close failed: %s", err)
