Fix tests and examples

client_test.go

@@ -74,6 +74,7 @@ func TestClientMetadata(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer client.Close()
 
 	parts, err := client.partitions("myTopic")
 	if err != nil {
@@ -88,8 +89,6 @@ func TestClientMetadata(t *testing.T) {
 	} else if tst.ID() != 5 {
 		t.Error("Leader for myTopic had incorrect ID.")
 	}
-
-	client.Close()
 }
 
 func TestClientRefreshBehaviour(t *testing.T) {
@@ -135,6 +134,7 @@ func TestClientRefreshBehaviour(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer client.Close()
 
 	parts, err := client.partitions("myTopic")
 	if err != nil {
@@ -151,6 +151,4 @@ func TestClientRefreshBehaviour(t *testing.T) {
 	}
 
 	client.disconnectBroker(tst)
-
-	client.Close()
 }

consumer_test.go

@@ -68,11 +68,13 @@ func TestSimpleConsumer(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer client.Close()
 
 	consumer, err := NewConsumer(client, "myTopic", 0, "myConsumerGroup", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer consumer.Close()
 
 	for i := 0; i < 10; i++ {
 		select {
@@ -84,9 +86,6 @@ func TestSimpleConsumer(t *testing.T) {
 			t.Error(err)
 		}
 	}
-
-	consumer.Close()
-	client.Close()
 }
 
 func ExampleConsumer() {
@@ -96,6 +95,7 @@ func ExampleConsumer() {
 	} else {
 		fmt.Println("> connected")
 	}
+	defer client.Close()
 
 	consumer, err := NewConsumer(client, "myTopic", 0, "myConsumerGroup", nil)
 	if err != nil {
@@ -103,6 +103,7 @@ func ExampleConsumer() {
 	} else {
 		fmt.Println("> consumer ready")
 	}
+	defer consumer.Close()
 
 consumerLoop:
 	for {
@@ -116,7 +117,4 @@ consumerLoop:
 			break consumerLoop
 		}
 	}
-
-	consumer.Close()
-	client.Close()
 }

producer_test.go

@@ -49,19 +49,20 @@ func TestSimpleProducer(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer client.Close()
 
 	producer, err := NewProducer(client, "myTopic", &ProducerConfig{RequiredAcks: WAIT_FOR_LOCAL})
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer producer.Close()
+
 	for i := 0; i < 10; i++ {
 		err = producer.SendMessage(nil, StringEncoder("ABC THE MESSAGE"))
 		if err != nil {
 			t.Error(err)
 		}
 	}
-
-	client.Close()
 }
 
 func ExampleProducer() {
@@ -71,10 +72,13 @@ func ExampleProducer() {
 	} else {
 		fmt.Println("> connected")
 	}
+	defer client.Close()
+
 	producer, err := NewProducer(client, "myTopic", &ProducerConfig{RequiredAcks: WAIT_FOR_LOCAL})
 	if err != nil {
 		panic(err)
 	}
+	defer producer.Close()
 
 	err = producer.SendMessage(nil, StringEncoder("testing 123"))
 	if err != nil {
@@ -82,6 +86,4 @@ func ExampleProducer() {
 	} else {
 		fmt.Println("> message sent")
 	}
-
-	client.Close()
 }