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

Merge pull request #719 from lucas-clemente/fix-718

Browse Source 
improve proxy tests
This commit is contained in:
Marten Seemann
2017-07-07 17:08:27 +02:00
committed by GitHub
parent dc3b85f020 32bc70ba0c
commit 3157e2da99
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
integrationtests/proxy/proxy_test.go
View File

@@ -7,6 +7,8 @@ import (
"sync/atomic"
"time"
"fmt"
"github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/protocol"
. "github.com/onsi/ginkgo"
@@ -38,44 +40,44 @@ var _ = Describe("QUIC Proxy", func() {
Context("Proxy setup and teardown", func() {
It("sets up the UDPProxy", func() {
proxy, err := NewQuicProxy("localhost:13370", Opts{RemoteAddr: serverAddr})
proxy, err := NewQuicProxy("localhost:0", Opts{RemoteAddr: serverAddr})
Expect(err).ToNot(HaveOccurred())
Expect(proxy.clientDict).To(HaveLen(0))
// check that port 13370 is in use
addr, err := net.ResolveUDPAddr("udp", "localhost:13370")
// check that the proxy port is in use
addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(proxy.LocalPort()))
Expect(err).ToNot(HaveOccurred())
_, err = net.ListenUDP("udp", addr)
Expect(err).To(MatchError("listen udp 127.0.0.1:13370: bind: address already in use"))
err = proxy.Close() // stopping is tested in the next test
Expect(err).ToNot(HaveOccurred())
Expect(err).To(MatchError(fmt.Sprintf("listen udp 127.0.0.1:%d: bind: address already in use", proxy.LocalPort())))
Expect(proxy.Close()).To(Succeed()) // stopping is tested in the next test
})
It("stops the UDPProxy", func() {
proxy, err := NewQuicProxy("localhost:13371", Opts{RemoteAddr: serverAddr})
proxy, err := NewQuicProxy("localhost:0", Opts{RemoteAddr: serverAddr})
Expect(err).ToNot(HaveOccurred())
port := proxy.LocalPort()
err = proxy.Close()
Expect(err).ToNot(HaveOccurred())
// check that port 13371 is not in use anymore
addr, err := net.ResolveUDPAddr("udp", "localhost:13371")
Expect(err).ToNot(HaveOccurred())
ln, err := net.ListenUDP("udp", addr)
Expect(err).ToNot(HaveOccurred())
err = ln.Close()
// check that the proxy port is not in use anymore
addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(port))
Expect(err).ToNot(HaveOccurred())
// sometimes it takes a while for the OS to free the port
Eventually(func() error {
ln, err := net.ListenUDP("udp", addr)
defer ln.Close()
return err
}).ShouldNot(HaveOccurred())
})
It("has the correct LocalAddr and LocalPort", func() {
proxy, err := NewQuicProxy("localhost:13372", Opts{RemoteAddr: serverAddr})
proxy, err := NewQuicProxy("localhost:0", Opts{RemoteAddr: serverAddr})
Expect(err).ToNot(HaveOccurred())
Expect(proxy.LocalAddr().String()).To(Equal("127.0.0.1:13372"))
Expect(proxy.LocalPort()).To(Equal(13372))
Expect(proxy.LocalAddr().String()).To(Equal("127.0.0.1:" + strconv.Itoa(proxy.LocalPort())))
Expect(proxy.LocalPort()).ToNot(BeZero())
err = proxy.Close()
Expect(err).ToNot(HaveOccurred())
Expect(proxy.Close()).To(Succeed())
})
})
@@ -88,10 +90,9 @@ var _ = Describe("QUIC Proxy", func() {
proxy *QuicProxy
)
// start the proxy on port 10001
startProxy := func(opts Opts) {
var err error
proxy, err = NewQuicProxy("localhost:10001", opts)
proxy, err = NewQuicProxy("localhost:0", opts)
Expect(err).ToNot(HaveOccurred())
clientConn, err = net.DialUDP("udp", nil, proxy.LocalAddr().(*net.UDPAddr))
Expect(err).ToNot(HaveOccurred())