Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e/expect: In case of sut process failure, print last 40lines of logs.

Browse Source
This commit is contained in:
Piotr Tabor 2021-03-10 21:55:46 +01:00
parent a47c18d30a
commit 67491a00ea
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/expect/expect.go
View File

@ -29,6 +29,8 @@ import (
"github.com/creack/pty" "github.com/creack/pty"
) )
const DEBUG_LINES_TAIL=40
type ExpectProcess struct { type ExpectProcess struct {
cmd *exec.Cmd cmd *exec.Cmd
fpty *os.File fpty *os.File
@ -96,6 +98,8 @@ func (ep *ExpectProcess) read() {
// ExpectFunc returns the first line satisfying the function f. // ExpectFunc returns the first line satisfying the function f.
func (ep *ExpectProcess) ExpectFunc(f func(string) bool) (string, error) { func (ep *ExpectProcess) ExpectFunc(f func(string) bool) (string, error) {
lastLinesBuffer := make([]string, 0)
ep.mu.Lock() ep.mu.Lock()
for { for {
for len(ep.lines) == 0 && ep.err == nil { for len(ep.lines) == 0 && ep.err == nil {
@ -106,13 +110,19 @@ func (ep *ExpectProcess) ExpectFunc(f func(string) bool) (string, error) {
} }
l := ep.lines[0] l := ep.lines[0]
ep.lines = ep.lines[1:] ep.lines = ep.lines[1:]
lastLinesBuffer = append(lastLinesBuffer, l)
if l:=len(lastLinesBuffer); l>DEBUG_LINES_TAIL {
lastLinesBuffer = lastLinesBuffer[l-DEBUG_LINES_TAIL:l-1]
}
if f(l) { if f(l) {
ep.mu.Unlock() ep.mu.Unlock()
return l, nil return l, nil
} }
} }
ep.mu.Unlock() ep.mu.Unlock()
return "", ep.err return "", fmt.Errorf("Match not found." +
" Set EXPECT_DEBUG for more info Err: %v, last lines:\n%s\n\n",
ep.err, strings.Join(lastLinesBuffer, ""))
} }
// Expect returns the first line containing the given string. // Expect returns the first line containing the given string.