Merge pull request #202 from shaazmik/dev

FailedWhenContains with SendWithCallbacks

driver/generic/sendwithcallbacks.go

@@ -218,10 +218,25 @@ func (d *Driver) SendWithCallbacks(
 	input string,
 	callbacks []*Callback,
 	timeout time.Duration,
+	opts ...util.Option,
 ) (*response.Response, error) {
 	d.Logger.Info("SendWithCallbacks requested")
 
-	r := response.NewResponse(input, d.Transport.GetHost(), d.Transport.GetPort(), nil)
+	driverOpts, err := NewOperation(opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(driverOpts.FailedWhenContains) == 0 {
+		driverOpts.FailedWhenContains = d.FailedWhenContains
+	}
+
+	r := response.NewResponse(
+		input,
+		d.Transport.GetHost(),
+		d.Transport.GetPort(),
+		driverOpts.FailedWhenContains,
+	)
 
 	if input != "" {
 		err := d.Channel.WriteAndReturn([]byte(input), false)

driver/generic/sendwithcallbacks_test.go

@@ -17,6 +17,7 @@ type sendWithCallbacksTestCase struct {
 	payloadFile  string
 	initialInput string
 	callbacks    []*generic.Callback
+	failed       bool
 }
 
 func testSendWithCallbacks(
@@ -37,10 +38,9 @@ func testSendWithCallbacks(
 			)
 		}
 
-		if r.Failed != nil {
+		if r.Failed != nil && !testCase.failed {
 			t.Fatalf(
-				"%s: response object indicates failure,"+
-					" this shouldn't happenf or send with callbacks",
+				"%s: response object indicates failure, this shouldn't happen",
 				testName,
 			)
 		}
@@ -91,6 +91,32 @@ func TestSendWithCallbacks(t *testing.T) {
 				},
 			},
 		},
+		"send-with-callbacks-failed-when-contains": {
+			description:  "simple send with callbacks test w/ failed when contains output",
+			payloadFile:  "send-with-callbacks-failed-when-contains.txt",
+			initialInput: "",
+			callbacks: []*generic.Callback{
+				{
+					Callback: func(d *generic.Driver, _ string) error {
+						_, err := d.Channel.SendInput("configure terminal")
+
+						return err
+					},
+					Contains:    "C3560CX#",
+					Name:        "callback-one",
+					ResetOutput: true,
+				},
+				{
+					Callback: func(d *generic.Driver, _ string) error {
+						return d.Channel.WriteAndReturn([]byte("show version"), false)
+					},
+					ContainsRe: regexp.MustCompile(`(?im)^c3560cx\(config\)#`),
+					Name:       "callback-two",
+					Complete:   true,
+				},
+			},
+			failed: true,
+		},
 	}
 
 	for testName, testCase := range cases {

driver/generic/test-fixtures/golden/send-with-callbacks-failed-when-contains-in.txt

@@ -0,0 +1,5 @@
+configure terminal
+
+
+show version
+

driver/generic/test-fixtures/send-with-callbacks-failed-when-contains.txt

@@ -0,0 +1,7 @@
+C3560CX#configure terminal
+Enter configuration commands, one per line.  End with CNTL/Z.
+C3560CX(config)#show version
+                  ^
+% Invalid input detected at '^' marker.
+
+C3560CX(config)#

driver/generic/test-fixtures/send-with-callbacks-simple.txt

@@ -2,6 +2,6 @@ C3560CX#configure terminal
 Enter configuration commands, one per line.  End with CNTL/Z.
 C3560CX(config)#show version
                   ^
-% Invalid input detected at '^' marker.
+NOTHING TO SEE HERE -- dont want the test to have a failed result, so just making this show no failed when contains thing :)
 
 C3560CX(config)#

go.mod

@@ -11,3 +11,4 @@ require (
 )
 
 require golang.org/x/sys v0.23.0 // indirect
+