Merge "Enable tests that depended on Go 1.7 functionality"

hyperledger · Nov 22, 2016 · 77c7323 · 77c7323
2 parents 2068322 + 5ce0d90
commit 77c7323
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/orderer/kafka/broker_test.go b/orderer/kafka/broker_test.go
@@ -16,13 +16,16 @@ limitations under the License.
 
 package kafka
 
-import "testing"
+import (
+ "testing"
+
+ "github.com/Shopify/sarama"
+)
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestBrokerGetOffset(t *testing.T) {
  t.Run("oldest", testBrokerGetOffsetFunc(sarama.OffsetOldest, oldestOffset))
  t.Run("newest", testBrokerGetOffsetFunc(sarama.OffsetNewest, newestOffset))
-} */
+}
 
 func testBrokerGetOffsetFunc(given, expected int64) func(t *testing.T) {
  return func(t *testing.T) {

diff --git a/orderer/kafka/client_deliver_test.go b/orderer/kafka/client_deliver_test.go
@@ -23,13 +23,12 @@ import (
  ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestClientDeliverSeekWrong(t *testing.T) {
  t.Run("out-of-range-1", testClientDeliverSeekWrongFunc(uint64(oldestOffset)-1, 10))
  t.Run("out-of-range-2", testClientDeliverSeekWrongFunc(uint64(newestOffset), 10))
  t.Run("bad-window-1", testClientDeliverSeekWrongFunc(uint64(oldestOffset), 0))
  t.Run("bad-window-2", testClientDeliverSeekWrongFunc(uint64(oldestOffset), uint64(testConf.General.MaxWindowSize+1)))
-} */
+}
 
 func testClientDeliverSeekWrongFunc(seek, window uint64) func(t *testing.T) {
  return func(t *testing.T) {
@@ -64,12 +63,11 @@ func testClientDeliverSeekWrongFunc(seek, window uint64) func(t *testing.T) {
  }
 }
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestClientDeliverSeek(t *testing.T) {
  t.Run("oldest", testClientDeliverSeekFunc("oldest", 0, 10, 10))
  t.Run("in-between", testClientDeliverSeekFunc("specific", uint64(middleOffset), 10, 10))
  t.Run("newest", testClientDeliverSeekFunc("newest", 0, 10, 1))
-} */
+}
 
 func testClientDeliverSeekFunc(label string, seek, window uint64, expected int) func(*testing.T) {
  return func(t *testing.T) {
@@ -105,11 +103,10 @@ func testClientDeliverSeekFunc(label string, seek, window uint64, expected int)
  }
 }
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestClientDeliverAckWrong(t *testing.T) {
  t.Run("out-of-range-ack-1", testClientDeliverAckWrongFunc(uint64(middleOffset)-2))
  t.Run("out-of-range-ack-2", testClientDeliverAckWrongFunc(uint64(newestOffset)))
-} */
+}
 
 func testClientDeliverAckWrongFunc(ack uint64) func(t *testing.T) {
  return func(t *testing.T) {
@@ -143,11 +140,10 @@ func testClientDeliverAckWrongFunc(ack uint64) func(t *testing.T) {
  }
 }
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestClientDeliverAck(t *testing.T) {
  t.Run("in-between", testClientDeliverAckFunc("specific", uint64(middleOffset), 10, 10, 2*10))
  t.Run("newest", testClientDeliverAckFunc("newest", 0, 10, 1, 1))
-} */
+}
 
 func testClientDeliverAckFunc(label string, seek, window uint64, threshold, expected int) func(t *testing.T) {
  return func(t *testing.T) {

diff --git a/orderer/kafka/consumer_test.go b/orderer/kafka/consumer_test.go
@@ -30,12 +30,11 @@ func TestConsumerInitWrong(t *testing.T) {
  }
 }
 
-/* Disabling this until the upgrade to Go 1.7 kicks in
 func TestConsumerRecv(t *testing.T) {
  t.Run("oldest", testConsumerRecvFunc(oldestOffset, oldestOffset))
  t.Run("in-between", testConsumerRecvFunc(middleOffset, middleOffset))
  t.Run("newest", testConsumerRecvFunc(newestOffset-1, newestOffset-1))
-} */
+}
 
 func testConsumerRecvFunc(given, expected int64) func(t *testing.T) {
  return func(t *testing.T) {