[tor-commits] [snowflake/master] Update client tests for NewBrokerChannel errors

[dcf at torproject.org]

commit 7682986a451deb3a4d28240fa7d8b06ed5d7a5dd
Author: Cecylia Bocovich <cohosh at torproject.org>
Date:   Wed Jan 29 11:27:44 2020 -0500

    Update client tests for NewBrokerChannel errors
    
    We changed NewBrokerChannel to return an error value on failure. This
    updates the tests to check that value.
---
 client/lib/lib_test.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go
index 12368f3..d48c301 100644
--- a/client/lib/lib_test.go
+++ b/client/lib/lib_test.go
@@ -294,22 +294,25 @@ func TestSnowflakeClient(t *testing.T) {
 		fakeOffer := deserializeSessionDescription(`{"type":"offer","sdp":"test"}`)
 
 		Convey("Construct BrokerChannel with no front domain", func() {
-			b := NewBrokerChannel("test.broker", "", transport)
+			b, err := NewBrokerChannel("test.broker", "", transport)
 			So(b.url, ShouldNotBeNil)
+			So(err, ShouldBeNil)
 			So(b.url.Path, ShouldResemble, "test.broker")
 			So(b.transport, ShouldNotBeNil)
 		})
 
 		Convey("Construct BrokerChannel *with* front domain", func() {
-			b := NewBrokerChannel("test.broker", "front", transport)
+			b, err := NewBrokerChannel("test.broker", "front", transport)
 			So(b.url, ShouldNotBeNil)
+			So(err, ShouldBeNil)
 			So(b.url.Path, ShouldResemble, "test.broker")
 			So(b.url.Host, ShouldResemble, "front")
 			So(b.transport, ShouldNotBeNil)
 		})
 
 		Convey("BrokerChannel.Negotiate responds with answer", func() {
-			b := NewBrokerChannel("test.broker", "", transport)
+			b, err := NewBrokerChannel("test.broker", "", transport)
+			So(err, ShouldBeNil)
 			answer, err := b.Negotiate(fakeOffer)
 			So(err, ShouldBeNil)
 			So(answer, ShouldNotBeNil)
@@ -317,8 +320,9 @@ func TestSnowflakeClient(t *testing.T) {
 		})
 
 		Convey("BrokerChannel.Negotiate fails with 503", func() {
-			b := NewBrokerChannel("test.broker", "",
+			b, err := NewBrokerChannel("test.broker", "",
 				&MockTransport{http.StatusServiceUnavailable, []byte("\n")})
+			So(err, ShouldBeNil)
 			answer, err := b.Negotiate(fakeOffer)
 			So(err, ShouldNotBeNil)
 			So(answer, ShouldBeNil)
@@ -326,8 +330,9 @@ func TestSnowflakeClient(t *testing.T) {
 		})
 
 		Convey("BrokerChannel.Negotiate fails with 400", func() {
-			b := NewBrokerChannel("test.broker", "",
+			b, err := NewBrokerChannel("test.broker", "",
 				&MockTransport{http.StatusBadRequest, []byte("\n")})
+			So(err, ShouldBeNil)
 			answer, err := b.Negotiate(fakeOffer)
 			So(err, ShouldNotBeNil)
 			So(answer, ShouldBeNil)
@@ -335,8 +340,9 @@ func TestSnowflakeClient(t *testing.T) {
 		})
 
 		Convey("BrokerChannel.Negotiate fails with large read", func() {
-			b := NewBrokerChannel("test.broker", "",
+			b, err := NewBrokerChannel("test.broker", "",
 				&MockTransport{http.StatusOK, make([]byte, 100001, 100001)})
+			So(err, ShouldBeNil)
 			answer, err := b.Negotiate(fakeOffer)
 			So(err, ShouldNotBeNil)
 			So(answer, ShouldBeNil)
@@ -344,8 +350,9 @@ func TestSnowflakeClient(t *testing.T) {
 		})
 
 		Convey("BrokerChannel.Negotiate fails with unexpected error", func() {
-			b := NewBrokerChannel("test.broker", "",
+			b, err := NewBrokerChannel("test.broker", "",
 				&MockTransport{123, []byte("")})
+			So(err, ShouldBeNil)
 			answer, err := b.Negotiate(fakeOffer)
 			So(err, ShouldNotBeNil)
 			So(answer, ShouldBeNil)