gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1058 from lucas-clemente/fix-stopping-of-testserver

Browse Source 
fix stopping of testserver
This commit is contained in:
Marten Seemann
2017-12-21 10:43:46 +07:00
committed by GitHub
parent ed212b789c e4e74e0873
commit edb5fd751c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integrationtests/tools/testserver/server.go
View File

@@ -25,8 +25,9 @@ var (
PRData = GeneratePRData(dataLen) PRData = GeneratePRData(dataLen)
PRDataLong = GeneratePRData(dataLenLong) PRDataLong = GeneratePRData(dataLenLong)
server *h2quic.Server server *h2quic.Server
port string stoppedServing chan struct{}
port string
) )
func init() { func init() {
@@ -95,14 +96,18 @@ func StartQuicServer(versions []protocol.VersionNumber) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
port = strconv.Itoa(conn.LocalAddr().(*net.UDPAddr).Port) port = strconv.Itoa(conn.LocalAddr().(*net.UDPAddr).Port)
stoppedServing = make(chan struct{})
go func() { go func() {
defer GinkgoRecover() defer GinkgoRecover()
server.Serve(conn) server.Serve(conn)
close(stoppedServing)
}() }()
} }
func StopQuicServer() { func StopQuicServer() {
Expect(server.Close()).NotTo(HaveOccurred()) Expect(server.Close()).NotTo(HaveOccurred())
Eventually(stoppedServing).Should(BeClosed())
} }
func Port() string { func Port() string {