Merge branch 'master' into release-3.10.0

PaloAltoNetworks · Jun 10, 2019 · a8cdfd9 · a8cdfd9
2 parents 5fbac2a + 5377d0c
commit a8cdfd9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/internal/push/push.go b/internal/push/push.go
@@ -148,7 +148,6 @@ func (s *subscription) connect(ctx context.Context, initial bool) (err error) {
 
 			resp.Body.Close() // nolint
 
-			try = 0
 			return nil
 		}
 

diff --git a/maniphttp/helpers_test.go b/maniphttp/helpers_test.go
@@ -204,7 +204,7 @@ func TestManiphttp_DirectSend(t *testing.T) {
 			}
 
 			if string(body) != "hello" {
-				panic("wrong body recieved.")
+				panic("wrong body received.")
 			}
 
 			if !strings.HasSuffix(r.RequestURI, "/toto") {

diff --git a/manipvortex/manipulator_test.go b/manipvortex/manipulator_test.go
@@ -83,7 +83,7 @@ func newIdentityProcessor(readConsistency manipulate.ReadConsistency, writeConsi
 func Test_New(t *testing.T) {
 	t.Parallel()
 
-	Convey("When I create a new memdb vortex, I sould have correct structures", t, func() {
+	Convey("When I create a new memdb vortex, I should have correct structures", t, func() {
 		m := maniptest.NewTestManipulator()
 		d, err := newDatastore()
 		So(err, ShouldBeNil)
-Original file line number
+Diff line change
@@ Expand Up @@
     			resp.Body.Close() // nolint
-    			try = 0
     			return nil
     		}
@@ Expand Down @@