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

Use ShouldBeNil to check for nil values

Browse source
This commit is contained in:
Cecylia Bocovich 2023-09-19 13:19:27 -04:00
parent e45e8e555b
commit 3a050c6bb3
No known key found for this signature in database
GPG key ID: 009DE379FD9B7B90
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
broker/snowflake-broker_test.go
View file

@ -553,7 +553,7 @@ func TestInvalidGeoipFile(t *testing.T) {
log.Printf("loading geo ip databases returned error: %v", err) log.Printf("loading geo ip databases returned error: %v", err)
} }
ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnrestricted) ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnrestricted)
So(ctx.metrics.geoipdb, ShouldEqual, nil) So(ctx.metrics.geoipdb, ShouldBeNil)
}) })
} }
@ -566,7 +566,7 @@ func TestMetrics(t *testing.T) {
i := &IPC{ctx} i := &IPC{ctx}
err := ctx.metrics.LoadGeoipDatabases("test_geoip", "test_geoip6") err := ctx.metrics.LoadGeoipDatabases("test_geoip", "test_geoip6")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
//Test addition of proxy polls //Test addition of proxy polls
Convey("for proxy polls", func() { Convey("for proxy polls", func() {

34
common/messages/messages_test.go
View file

@ -123,13 +123,13 @@ func TestDecodeProxyPollRequest(t *testing.T) {
func TestEncodeProxyPollRequests(t *testing.T) { func TestEncodeProxyPollRequests(t *testing.T) {
Convey("Context", t, func() { Convey("Context", t, func() {
b, err := EncodeProxyPollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown", 16) b, err := EncodeProxyPollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown", 16)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
sid, proxyType, natType, clients, err := DecodeProxyPollRequest(b) sid, proxyType, natType, clients, err := DecodeProxyPollRequest(b)
So(sid, ShouldEqual, "ymbcCMto7KHNGYlp") So(sid, ShouldEqual, "ymbcCMto7KHNGYlp")
So(proxyType, ShouldEqual, "standalone") So(proxyType, ShouldEqual, "standalone")
So(natType, ShouldEqual, "unknown") So(natType, ShouldEqual, "unknown")
So(clients, ShouldEqual, 16) So(clients, ShouldEqual, 16)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
}) })
} }
@ -180,18 +180,18 @@ func TestDecodeProxyPollResponse(t *testing.T) {
func TestEncodeProxyPollResponse(t *testing.T) { func TestEncodeProxyPollResponse(t *testing.T) {
Convey("Context", t, func() { Convey("Context", t, func() {
b, err := EncodePollResponse("fake offer", true, "restricted") b, err := EncodePollResponse("fake offer", true, "restricted")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
offer, natType, err := DecodePollResponse(b) offer, natType, err := DecodePollResponse(b)
So(offer, ShouldEqual, "fake offer") So(offer, ShouldEqual, "fake offer")
So(natType, ShouldEqual, "restricted") So(natType, ShouldEqual, "restricted")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
b, err = EncodePollResponse("", false, "unknown") b, err = EncodePollResponse("", false, "unknown")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
offer, natType, err = DecodePollResponse(b) offer, natType, err = DecodePollResponse(b)
So(offer, ShouldEqual, "") So(offer, ShouldEqual, "")
So(natType, ShouldEqual, "unknown") So(natType, ShouldEqual, "unknown")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
}) })
} }
@ -267,11 +267,11 @@ func TestDecodeProxyAnswerRequest(t *testing.T) {
func TestEncodeProxyAnswerRequest(t *testing.T) { func TestEncodeProxyAnswerRequest(t *testing.T) {
Convey("Context", t, func() { Convey("Context", t, func() {
b, err := EncodeAnswerRequest("test answer", "test sid") b, err := EncodeAnswerRequest("test answer", "test sid")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
answer, sid, err := DecodeAnswerRequest(b) answer, sid, err := DecodeAnswerRequest(b)
So(answer, ShouldEqual, "test answer") So(answer, ShouldEqual, "test answer")
So(sid, ShouldEqual, "test sid") So(sid, ShouldEqual, "test sid")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
}) })
} }
@ -309,16 +309,16 @@ func TestDecodeProxyAnswerResponse(t *testing.T) {
func TestEncodeProxyAnswerResponse(t *testing.T) { func TestEncodeProxyAnswerResponse(t *testing.T) {
Convey("Context", t, func() { Convey("Context", t, func() {
b, err := EncodeAnswerResponse(true) b, err := EncodeAnswerResponse(true)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
success, err := DecodeAnswerResponse(b) success, err := DecodeAnswerResponse(b)
So(success, ShouldEqual, true) So(success, ShouldEqual, true)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
b, err = EncodeAnswerResponse(false) b, err = EncodeAnswerResponse(false)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
success, err = DecodeAnswerResponse(b) success, err = DecodeAnswerResponse(b)
So(success, ShouldEqual, false) So(success, ShouldEqual, false)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
}) })
} }
@ -406,7 +406,7 @@ func TestEncodeClientPollRequests(t *testing.T) {
Fingerprint: test.fingerprint, Fingerprint: test.fingerprint,
} }
b, err := req1.EncodeClientPollRequest() b, err := req1.EncodeClientPollRequest()
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
req2, err := DecodeClientPollRequest(b) req2, err := DecodeClientPollRequest(b)
So(err, ShouldHaveSameTypeAs, test.err) So(err, ShouldHaveSameTypeAs, test.err)
if test.err == nil { if test.err == nil {
@ -455,18 +455,18 @@ func TestEncodeClientPollResponse(t *testing.T) {
Answer: "fake answer", Answer: "fake answer",
} }
b, err := resp1.EncodePollResponse() b, err := resp1.EncodePollResponse()
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
resp2, err := DecodeClientPollResponse(b) resp2, err := DecodeClientPollResponse(b)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
So(resp1, ShouldResemble, resp2) So(resp1, ShouldResemble, resp2)
resp1 = &ClientPollResponse{ resp1 = &ClientPollResponse{
Error: "failed", Error: "failed",
} }
b, err = resp1.EncodePollResponse() b, err = resp1.EncodePollResponse()
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
resp2, err = DecodeClientPollResponse(b) resp2, err = DecodeClientPollResponse(b)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
So(resp1, ShouldResemble, resp2) So(resp1, ShouldResemble, resp2)
}) })
} }

14
proxy/lib/proxy-go_test.go
View file

@ -338,7 +338,7 @@ func TestBrokerInteractions(t *testing.T) {
Convey("Proxy connections to broker", t, func() { Convey("Proxy connections to broker", t, func() {
var err error var err error
broker, err = newSignalingServer("localhost", false) broker, err = newSignalingServer("localhost", false)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
tokens = newTokens(0) tokens = newTokens(0)
//Mock peerConnection //Mock peerConnection
@ -359,7 +359,7 @@ func TestBrokerInteractions(t *testing.T) {
var err error var err error
b, err := messages.EncodePollResponse(sampleOffer, true, "unknown") b, err := messages.EncodePollResponse(sampleOffer, true, "unknown")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
broker.transport = &MockTransport{ broker.transport = &MockTransport{
http.StatusOK, http.StatusOK,
b, b,
@ -373,7 +373,7 @@ func TestBrokerInteractions(t *testing.T) {
var err error var err error
b := []byte("test") b := []byte("test")
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
broker.transport = &MockTransport{ broker.transport = &MockTransport{
http.StatusOK, http.StatusOK,
b, b,
@ -386,17 +386,17 @@ func TestBrokerInteractions(t *testing.T) {
var err error var err error
b, err := messages.EncodeAnswerResponse(true) b, err := messages.EncodeAnswerResponse(true)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
broker.transport = &MockTransport{ broker.transport = &MockTransport{
http.StatusOK, http.StatusOK,
b, b,
} }
err = broker.sendAnswer(sampleAnswer, pc) err = broker.sendAnswer(sampleAnswer, pc)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
b, err = messages.EncodeAnswerResponse(false) b, err = messages.EncodeAnswerResponse(false)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
broker.transport = &MockTransport{ broker.transport = &MockTransport{
http.StatusOK, http.StatusOK,
b, b,
@ -486,7 +486,7 @@ func TestUtilityFuncs(t *testing.T) {
bytes := make([]byte, 6) bytes := make([]byte, 6)
n, err := c2.Read(bytes) n, err := c2.Read(bytes)
So(n, ShouldEqual, 6) So(n, ShouldEqual, 6)
So(err, ShouldEqual, nil) So(err, ShouldBeNil)
So(bytes, ShouldResemble, []byte("Hello!")) So(bytes, ShouldResemble, []byte("Hello!"))
s1.Close() s1.Close()