From 2d10796bc25f5e9d83c18ba852922ab295d948d7 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 27 Sep 2018 11:55:39 -0600 Subject: [PATCH] stop the listener in the server unit tests --- server_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/server_test.go b/server_test.go index 387ec665a..dd418e5d6 100644 --- a/server_test.go +++ b/server_test.go @@ -254,12 +254,12 @@ var _ = Describe("Server", func() { Expect(serv.Close()).To(Succeed()) }) - It("works if no quic.Config is given", func(done Done) { + It("works if no quic.Config is given", func() { ln, err := ListenAddr("127.0.0.1:0", testdata.GetTLSConfig(), nil) Expect(err).ToNot(HaveOccurred()) + // stop the listener Expect(ln.Close()).To(Succeed()) - close(done) - }, 1) + }) It("closes properly", func() { ln, err := ListenAddr("127.0.0.1:0", testdata.GetTLSConfig(), config) @@ -271,7 +271,7 @@ var _ = Describe("Server", func() { ln.Accept() close(done) }() - ln.Close() + Expect(ln.Close()).To(Succeed()) Eventually(done).Should(BeClosed()) }) @@ -426,6 +426,8 @@ var _ = Describe("Server", func() { Expect(server.config.IdleTimeout).To(Equal(42 * time.Minute)) Expect(reflect.ValueOf(server.config.AcceptCookie)).To(Equal(reflect.ValueOf(acceptCookie))) Expect(server.config.KeepAlive).To(BeTrue()) + // stop the listener + Expect(ln.Close()).To(Succeed()) }) It("errors when the Config contains an invalid version", func() { @@ -443,6 +445,8 @@ var _ = Describe("Server", func() { Expect(server.config.IdleTimeout).To(Equal(protocol.DefaultIdleTimeout)) Expect(reflect.ValueOf(server.config.AcceptCookie)).To(Equal(reflect.ValueOf(defaultAcceptCookie))) Expect(server.config.KeepAlive).To(BeFalse()) + // stop the listener + Expect(ln.Close()).To(Succeed()) }) It("listens on a given address", func() { @@ -451,6 +455,8 @@ var _ = Describe("Server", func() { Expect(err).ToNot(HaveOccurred()) serv := ln.(*server) Expect(serv.Addr().String()).To(Equal(addr)) + // stop the listener + Expect(ln.Close()).To(Succeed()) }) It("errors if given an invalid address", func() {