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 #12828 from ptabor/20210404-embed-etcd

Browse Source 
embed: etcd.Close() is closing Errc() channel as well.
This commit is contained in:
Piotr Tabor
2021-04-08 01:20:07 +02:00
committed by GitHub
parent 816d332d81 5da9cac193
commit e776efbb2a
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/integration/embed/embed_test.go
View File

@@ -119,8 +119,9 @@ func TestEmbedEtcd(t *testing.T) {
e.Close()
select {
case err := <-e.Err():
t.Errorf("#%d: unexpected error on close (%v)", i, err)
default:
if err != nil {
t.Errorf("#%d: unexpected error on close (%v)", i, err)
}
}
}
}
@@ -174,12 +175,14 @@ func testEmbedEtcdGracefulStop(t *testing.T, secure bool) {
close(donec)
}()
select {
case err := <-e.Err():
t.Fatal(err)
case <-donec:
case <-time.After(2*time.Second + e.Server.Cfg.ReqTimeout()):
t.Fatalf("took too long to close server")
}
err = <-e.Err()
if err != nil {
t.Fatal(err)
}
}
func newEmbedURLs(secure bool, n int) (urls []url.URL) {