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

bind proxy to random port in proxy tests

Browse Source
This commit is contained in:
Marten Seemann
2017-07-06 11:11:23 +02:00
parent dc3b85f020
commit c776a35b68
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
integrationtests/proxy/proxy_test.go
View File

@@ -38,44 +38,42 @@ var _ = Describe("QUIC Proxy", func() {
Context("Proxy setup and teardown", func() { Context("Proxy setup and teardown", func() {
It("sets up the UDPProxy", 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(err).ToNot(HaveOccurred())
Expect(proxy.clientDict).To(HaveLen(0)) Expect(proxy.clientDict).To(HaveLen(0))
// check that port 13370 is in use // check that the proxy port is in use
addr, err := net.ResolveUDPAddr("udp", "localhost:13370") addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(proxy.LocalPort()))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
_, err = net.ListenUDP("udp", addr) _, err = net.ListenUDP("udp", addr)
Expect(err).To(MatchError("listen udp 127.0.0.1:13370: bind: address already in use")) Expect(err).To(MatchError("listen udp 127.0.0.1:" + strconv.Itoa(proxy.LocalPort()) + ": bind: address already in use"))
err = proxy.Close() // stopping is tested in the next test Expect(proxy.Close()).To(Succeed()) // stopping is tested in the next test
Expect(err).ToNot(HaveOccurred())
}) })
It("stops the UDPProxy", func() { 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()) Expect(err).ToNot(HaveOccurred())
port := proxy.LocalPort()
err = proxy.Close() err = proxy.Close()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
// check that port 13371 is not in use anymore // check that the proxy port is not in use anymore
addr, err := net.ResolveUDPAddr("udp", "localhost:13371") addr, err := net.ResolveUDPAddr("udp", "localhost:"+strconv.Itoa(port))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
ln, err := net.ListenUDP("udp", addr) ln, err := net.ListenUDP("udp", addr)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
err = ln.Close() Expect(ln.Close()).To(Succeed())
Expect(err).ToNot(HaveOccurred())
}) })
It("has the correct LocalAddr and LocalPort", func() { 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(err).ToNot(HaveOccurred())
Expect(proxy.LocalAddr().String()).To(Equal("127.0.0.1:13372")) Expect(proxy.LocalAddr().String()).To(Equal("127.0.0.1:" + strconv.Itoa(proxy.LocalPort())))
Expect(proxy.LocalPort()).To(Equal(13372)) Expect(proxy.LocalPort()).ToNot(BeZero())
err = proxy.Close() Expect(proxy.Close()).To(Succeed())
Expect(err).ToNot(HaveOccurred())
}) })
}) })
@@ -88,10 +86,9 @@ var _ = Describe("QUIC Proxy", func() {
proxy *QuicProxy proxy *QuicProxy
) )
// start the proxy on port 10001
startProxy := func(opts Opts) { startProxy := func(opts Opts) {
var err error var err error
proxy, err = NewQuicProxy("localhost:10001", opts) proxy, err = NewQuicProxy("localhost:0", opts)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
clientConn, err = net.DialUDP("udp", nil, proxy.LocalAddr().(*net.UDPAddr)) clientConn, err = net.DialUDP("udp", nil, proxy.LocalAddr().(*net.UDPAddr))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())