From c88e47b8da4eb9749cde5b533301d2ef94c9ebe6 Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan.kozlovic@apcera.com>
Date: Mon, 5 Dec 2016 13:49:40 -0700
Subject: [PATCH 1/2] Remove test [ci skip]

Removed TestRedeliveryHonorMaxInflight since server now always
send messages during redelivery.
Furthermore, this was more a server test than client test.
---
 stan_test.go | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/stan_test.go b/stan_test.go
index 9a0d632..f40e01b 100644
--- a/stan_test.go
+++ b/stan_test.go
@@ -1054,51 +1054,6 @@ func TestRedelivery(t *testing.T) {
 	}
 }
 
-func TestRedeliveryHonorMaxInflight(t *testing.T) {
-	// Run a NATS Streaming server
-	s := RunServer(clusterName)
-	defer s.Shutdown()
-
-	sc := NewDefaultConnection(t)
-	defer sc.Close()
-
-	toSend := int32(100)
-	hw := []byte("Hello World")
-
-	for i := int32(0); i < toSend; i++ {
-		sc.Publish("foo", hw)
-	}
-
-	errCh := make(chan string)
-	received := int32(0)
-
-	ackRedeliverTime := 1 * time.Second
-
-	sub, err := sc.Subscribe("foo", func(m *Msg) {
-		if m.Redelivered {
-			errCh <- fmt.Sprintf("Message %d was redelivered", m.Sequence)
-			return
-		}
-		atomic.AddInt32(&received, 1)
-
-	}, DeliverAllAvailable(), MaxInflight(100), AckWait(ackRedeliverTime), SetManualAckMode())
-	if err != nil {
-		t.Fatalf("Unexpected error on Subscribe, got %v\n", err)
-	}
-	defer sub.Unsubscribe()
-
-	select {
-	case e := <-errCh:
-		t.Fatalf("%s", e)
-	case <-time.After(2 * time.Second):
-		// Wait for up to 2 seconds to see if messages are redelivered
-		break
-	}
-	if nr := atomic.LoadInt32(&received); nr != toSend {
-		t.Fatalf("Expected to get 100 messages, got %d\n", nr)
-	}
-}
-
 func checkTime(t *testing.T, label string, time1, time2 time.Time, expected time.Duration, tolerance time.Duration) {
 	duration := time2.Sub(time1)
 

From 0e3b2c66d2a2bfc9f9d61f7bad1fb78ca3ca0c58 Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan.kozlovic@apcera.com>
Date: Mon, 5 Dec 2016 13:52:17 -0700
Subject: [PATCH 2/2] Update Travis: go 1.6.3 and 1.7.4

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ad46a7b..d88d5cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: go
 sudo: false
 go:
-- 1.5.4
 - 1.6.3
+- 1.7.4
 install:
 - go get -t ./...
 - go get github.com/nats-io/nats-streaming-server