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

Merge pull request #14471 from demoManito/cleanup/remove-assert

Browse Source 
pkg: replace the deprecated Expect with ExpectWithContext in pkg/expect/expect_test.go
This commit is contained in:
Benjamin Wang 2022-09-16 15:28:57 +08:00 committed by GitHub
commit d6f76e1aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/expect/expect_test.go
View File

@ -75,7 +75,8 @@ func TestEcho(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
l, eerr := ep.Expect("world") ctx := context.Background()
l, eerr := ep.ExpectWithContext(ctx, "world")
if eerr != nil { if eerr != nil {
t.Fatal(eerr) t.Fatal(eerr)
} }
@ -86,7 +87,7 @@ func TestEcho(t *testing.T) {
if cerr := ep.Close(); cerr != nil { if cerr := ep.Close(); cerr != nil {
t.Fatal(cerr) t.Fatal(cerr)
} }
if _, eerr = ep.Expect("..."); eerr == nil { if _, eerr = ep.ExpectWithContext(ctx, "..."); eerr == nil {
t.Fatalf("expected error on closed expect process") t.Fatalf("expected error on closed expect process")
} }
} }
@ -97,7 +98,7 @@ func TestLineCount(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
wstr := "3" wstr := "3"
l, eerr := ep.Expect(wstr) l, eerr := ep.ExpectWithContext(context.Background(), wstr)
if eerr != nil { if eerr != nil {
t.Fatal(eerr) t.Fatal(eerr)
} }
@ -120,7 +121,7 @@ func TestSend(t *testing.T) {
if err := ep.Send("a\r"); err != nil { if err := ep.Send("a\r"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if _, err := ep.Expect("b"); err != nil { if _, err := ep.ExpectWithContext(context.Background(), "b"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := ep.Stop(); err != nil { if err := ep.Stop(); err != nil {