archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 05:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broker tests

Browse source 
NewBrokerContext now requires a logger so give it one to discard the
logs.
This commit is contained in:
Arlo Breault 2019-05-16 12:34:21 -04:00
parent 762a52aee6
commit b77a99b565
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
broker/snowflake-broker_test.go
View file

@ -4,16 +4,25 @@ import (
"bytes" "bytes"
"container/heap" "container/heap"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"io/ioutil"
"log"
"net" "net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"testing" "testing"
) )
func NullLogger() *log.Logger {
logger := log.New(os.Stdout, "", 0)
logger.SetOutput(ioutil.Discard)
return logger
}
func TestBroker(t *testing.T) { func TestBroker(t *testing.T) {
Convey("Context", t, func() { Convey("Context", t, func() {
ctx := NewBrokerContext() ctx := NewBrokerContext(NullLogger())
Convey("Adds Snowflake", func() { Convey("Adds Snowflake", func() {
So(ctx.snowflakes.Len(), ShouldEqual, 0) So(ctx.snowflakes.Len(), ShouldEqual, 0)
@ -175,7 +184,7 @@ func TestBroker(t *testing.T) {
Convey("End-To-End", t, func() { Convey("End-To-End", t, func() {
done := make(chan bool) done := make(chan bool)
polled := make(chan bool) polled := make(chan bool)
ctx := NewBrokerContext() ctx := NewBrokerContext(NullLogger())
// Proxy polls with its ID first... // Proxy polls with its ID first...
dataP := bytes.NewReader([]byte("test")) dataP := bytes.NewReader([]byte("test"))
@ -364,7 +373,7 @@ func TestGeoip(t *testing.T) {
}) })
// Make sure things behave properly if geoip file fails to load // Make sure things behave properly if geoip file fails to load
ctx := NewBrokerContext() ctx := NewBrokerContext(NullLogger())
ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6") ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6")
ctx.metrics.UpdateCountryStats("127.0.0.1") ctx.metrics.UpdateCountryStats("127.0.0.1")
So(ctx.metrics.tablev4, ShouldEqual, nil) So(ctx.metrics.tablev4, ShouldEqual, nil)