Also normalize expect input, and add logging

ActiveState · Aug 30, 2023 · 502ea17 · 502ea17
1 parent 9b6c30f
commit 502ea17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/expect.go b/expect.go
@@ -114,6 +114,11 @@ func (tt *TermTest) Expect(value string, opts ...SetExpectOpt) error {
 }
 
 func (tt *TermTest) expect(value, buffer string) (endPos int, rerr error) {
+	if tt.opts.NormalizedLineEnds {
+		tt.opts.Logger.Println("NormalizedLineEnds prior to expect")
+		value = NormalizeLineEnds(value)
+	}
+
 	tt.opts.Logger.Printf("expect: '%s', buffer: '%s'\n", value, strings.Trim(strings.TrimSpace(buffer), "\x00"))
 	defer func() {
 		tt.opts.Logger.Printf("Match: %v\n", endPos > 0)

diff --git a/outputproducer.go b/outputproducer.go
@@ -104,6 +104,7 @@ func (o *outputProducer) appendBuffer(value []byte) error {
 	}
 
 	if o.opts.NormalizedLineEnds {
+		o.opts.Logger.Println("NormalizedLineEnds prior to appendBuffer")
 		output = NormalizeLineEndsB(output)
 	}
 

diff --git a/termtest.go b/termtest.go
@@ -306,6 +306,7 @@ func (tt *TermTest) Send(value string) (rerr error) {
 	}
 
 	if tt.opts.NormalizedLineEnds {
+		tt.opts.Logger.Println("NormalizedLineEnds prior to Send")
 		value = NormalizeLineEnds(value)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,6 +104,7 @@ func (o *outputProducer) appendBuffer(value []byte) error { @@
     	}
     	if o.opts.NormalizedLineEnds {
+    		o.opts.Logger.Println("NormalizedLineEnds prior to appendBuffer")
     		output = NormalizeLineEndsB(output)
     	}
@@ Expand Down @@