Simplify mock broker error handling

mock/broker.go

@@ -42,19 +42,19 @@ func (b *Broker) Close() {
 }
 
 // NewBroker launches a fake Kafka broker. It takes a testing.T as provided by the test framework and a channel of responses to use.
-// If an error occurs in the broker it is simply logged to the testing.T and the broker exits.
-func NewBroker(t *testing.T, responses chan []byte) (*Broker, error) {
+// If an error occurs it is simply logged to the testing.T and the broker exits.
+func NewBroker(t *testing.T, responses chan []byte) *Broker {
 	ln, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
-		return nil, err
+		t.Fatal(err)
 	}
 	_, portStr, err := net.SplitHostPort(ln.Addr().String())
 	if err != nil {
-		return nil, err
+		t.Fatal(err)
 	}
 	tmp, err := strconv.ParseInt(portStr, 10, 32)
 	if err != nil {
-		return nil, err
+		t.Fatal(err)
 	}
 	broker := new(Broker)
 	broker.port = int32(tmp)
@@ -125,5 +125,5 @@ func NewBroker(t *testing.T, responses chan []byte) (*Broker, error) {
 			return
 		}
 	}()
-	return broker, nil
+	return broker
 }

mock/broker_test.go

@@ -4,9 +4,6 @@ import "testing"
 
 func ExampleBroker(t *testing.T) {
 	responses := make(chan []byte)
-	broker, err := NewBroker(t, responses)
-	if err != nil {
-		t.Fatal(err)
-	}
+	broker := NewBroker(t, responses)
 	defer broker.Close()
 }

protocol/broker_test.go

@@ -81,14 +81,11 @@ func TestBrokerID(t *testing.T) {
 
 func TestSimpleBrokerCommunication(t *testing.T) {
 	responses := make(chan []byte)
-	mockBroker, err := mock.NewBroker(t, responses)
-	if err != nil {
-		t.Fatal(err)
-	}
+	mockBroker := mock.NewBroker(t, responses)
 	defer mockBroker.Close()
 
 	broker := NewBroker("localhost", mockBroker.Port())
-	err = broker.Connect()
+	err := broker.Connect()
 	if err != nil {
 		t.Fatal(err)
 	}