Browse Source

Merge pull request #314 from Shopify/errcheck-update

Check for errors in test code
Evan Huus 10 years ago
parent
commit
7c36236083
5 changed files with 50 additions and 17 deletions
  1. 3 4
      broker_test.go
  2. 20 4
      consumer_test.go
  3. 4 4
      functional_test.go
  4. 3 1
      partitioner_test.go
  5. 20 4
      producer_test.go

+ 3 - 4
broker_test.go

@@ -11,17 +11,17 @@ func ExampleBroker() error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	defer broker.Close()
 
 
 	request := MetadataRequest{Topics: []string{"myTopic"}}
 	request := MetadataRequest{Topics: []string{"myTopic"}}
 	response, err := broker.GetMetadata("myClient", &request)
 	response, err := broker.GetMetadata("myClient", &request)
 	if err != nil {
 	if err != nil {
+		_ = broker.Close()
 		return err
 		return err
 	}
 	}
 
 
 	fmt.Println("There are", len(response.Topics), "topics active in the cluster.")
 	fmt.Println("There are", len(response.Topics), "topics active in the cluster.")
 
 
-	return nil
+	return broker.Close()
 }
 }
 
 
 type mockEncoder struct {
 type mockEncoder struct {
@@ -29,8 +29,7 @@ type mockEncoder struct {
 }
 }
 
 
 func (m mockEncoder) encode(pe packetEncoder) error {
 func (m mockEncoder) encode(pe packetEncoder) error {
-	pe.putRawBytes(m.bytes)
-	return nil
+	return pe.putRawBytes(m.bytes)
 }
 }
 
 
 func TestBrokerAccessors(t *testing.T) {
 func TestBrokerAccessors(t *testing.T) {

+ 20 - 4
consumer_test.go

@@ -301,7 +301,11 @@ func ExampleConsumerWithSelect() {
 	} else {
 	} else {
 		fmt.Println("> connected")
 		fmt.Println("> connected")
 	}
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	master, err := NewConsumer(client, nil)
 	master, err := NewConsumer(client, nil)
 	if err != nil {
 	if err != nil {
@@ -316,7 +320,11 @@ func ExampleConsumerWithSelect() {
 	} else {
 	} else {
 		fmt.Println("> consumer ready")
 		fmt.Println("> consumer ready")
 	}
 	}
-	defer consumer.Close()
+	defer func() {
+		if err := consumer.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	msgCount := 0
 	msgCount := 0
 
 
@@ -342,7 +350,11 @@ func ExampleConsumerWithGoroutines() {
 	} else {
 	} else {
 		fmt.Println("> connected")
 		fmt.Println("> connected")
 	}
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	master, err := NewConsumer(client, nil)
 	master, err := NewConsumer(client, nil)
 	if err != nil {
 	if err != nil {
@@ -357,7 +369,11 @@ func ExampleConsumerWithGoroutines() {
 	} else {
 	} else {
 		fmt.Println("> consumer ready")
 		fmt.Println("> consumer ready")
 	}
 	}
-	defer consumer.Close()
+	defer func() {
+		if err := consumer.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	var (
 	var (
 		wg       sync.WaitGroup
 		wg       sync.WaitGroup

+ 4 - 4
functional_test.go

@@ -24,10 +24,10 @@ func init() {
 		kafkaAddr = "localhost:6667"
 		kafkaAddr = "localhost:6667"
 	}
 	}
 
 
-	c, err := net.Dial("tcp", kafkaAddr)
-	if err == nil {
-		kafkaIsAvailable = true
-		c.Close()
+	if c, err := net.Dial("tcp", kafkaAddr); err == nil {
+		if err = c.Close(); err == nil {
+			kafkaIsAvailable = true
+		}
 	}
 	}
 
 
 	kafkaShouldBeAvailable = os.Getenv("CI") != ""
 	kafkaShouldBeAvailable = os.Getenv("CI") != ""

+ 3 - 1
partitioner_test.go

@@ -92,7 +92,9 @@ func TestHashPartitioner(t *testing.T) {
 
 
 	buf := make([]byte, 256)
 	buf := make([]byte, 256)
 	for i := 1; i < 50; i++ {
 	for i := 1; i < 50; i++ {
-		rand.Read(buf)
+		if _, err := rand.Read(buf); err != nil {
+			t.Error(err)
+		}
 		assertPartitioningConsistent(t, partitioner, ByteEncoder(buf), 50)
 		assertPartitioningConsistent(t, partitioner, ByteEncoder(buf), 50)
 	}
 	}
 }
 }

+ 20 - 4
producer_test.go

@@ -575,13 +575,21 @@ func ExampleProducer() {
 	} else {
 	} else {
 		fmt.Println("> connected")
 		fmt.Println("> connected")
 	}
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	producer, err := NewProducer(client, nil)
 	producer, err := NewProducer(client, nil)
 	if err != nil {
 	if err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
-	defer producer.Close()
+	defer func() {
+		if err := producer.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	for {
 	for {
 		select {
 		select {
@@ -600,13 +608,21 @@ func ExampleSyncProducer() {
 	} else {
 	} else {
 		fmt.Println("> connected")
 		fmt.Println("> connected")
 	}
 	}
-	defer client.Close()
+	defer func() {
+		if err := client.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	producer, err := NewSyncProducer(client, nil)
 	producer, err := NewSyncProducer(client, nil)
 	if err != nil {
 	if err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
-	defer producer.Close()
+	defer func() {
+		if err := producer.Close(); err != nil {
+			panic(err)
+		}
+	}()
 
 
 	for {
 	for {
 		partition, offset, err := producer.SendMessage("my_topic", nil, StringEncoder("testing 123"))
 		partition, offset, err := producer.SendMessage("my_topic", nil, StringEncoder("testing 123"))