Remove additional unused functionality

bryphe-coder · bryphe-coder · commit 40c97c092b51 · 2022-02-14T18:57:51.000Z
diff --git a/expect/expect_opt.go b/expect/expect_opt.go
@@ -17,11 +17,9 @@ package expect
 import (
 	"bytes"
 	"errors"
-	"io"
 	"os"
 	"regexp"
 	"strings"
-	"syscall"
 	"time"
 )
 
@@ -224,38 +222,3 @@ func String(strs ...string) Opt {
 		return nil
 	}
 }
-
-// Error adds an Expect condition to exit if reading from Console's tty returns
-// one of the provided errors.
-func Error(errs ...error) Opt {
-	return func(opts *Opts) error {
-		for _, err := range errs {
-			opts.Matchers = append(opts.Matchers, &errorMatcher{
-				err: err,
-			})
-		}
-		return nil
-	}
-}
-
-// EOF adds an Expect condition to exit if io.EOF is returned from reading
-// Console's tty.
-func EOF(opts *Opts) error {
-	return Error(io.EOF)(opts)
-}
-
-// PTSClosed adds an Expect condition to exit if we get an
-// "read /dev/ptmx: input/output error" error which can occur
-// on Linux while reading from the ptm after the pts is closed.
-// Further Reading:
-// https://github.com/kr/pty/issues/21#issuecomment-129381749
-func PTSClosed(opts *Opts) error {
-	opts.Matchers = append(opts.Matchers, &pathErrorMatcher{
-		pathError: os.PathError{
-			Op:   "read",
-			Path: "/dev/ptmx",
-			Err:  syscall.Errno(0x5),
-		},
-	})
-	return nil
-}
diff --git a/expect/expect_opt_test.go b/expect/expect_opt_test.go
@@ -16,7 +16,6 @@ package expect_test
 
 import (
 	"bytes"
-	"io"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -82,60 +81,6 @@ func TestExpectOptString(t *testing.T) {
 	}
 }
 
-func TestExpectOptError(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		title    string
-		opt      Opt
-		data     error
-		expected bool
-	}{
-		{
-			"No args",
-			Error(),
-			io.EOF,
-			false,
-		},
-		{
-			"Single arg",
-			Error(io.EOF),
-			io.EOF,
-			true,
-		},
-		{
-			"Multiple arg",
-			Error(io.ErrShortWrite, io.EOF),
-			io.EOF,
-			true,
-		},
-		{
-			"No matches",
-			Error(io.ErrShortWrite),
-			io.EOF,
-			false,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.title, func(t *testing.T) {
-			t.Parallel()
-
-			var options Opts
-			err := test.opt(&options)
-			require.Nil(t, err)
-
-			matcher := options.Match(test.data)
-			if test.expected {
-				require.NotNil(t, matcher)
-			} else {
-				require.Nil(t, matcher)
-			}
-		})
-	}
-}
-
 func TestExpectOptAll(t *testing.T) {
 	t.Parallel()
 
