Merge remote-tracking branch 'origin/dev' into feature/refactor-ident…

…ity-option

.travis.yml

@@ -8,6 +8,8 @@ addons:
     packages:
     - python-virtualenv
 
+go_import_path: github.com/uber/ringpop-go
+
 install:
   - go get -u github.com/Masterminds/glide
   - go get github.com/axw/gocov/gocov

discovery/jsonfile/lib_test.go

@@ -57,5 +57,6 @@ func TestNiceJSONFile(t *testing.T) {
 	// Now actually test the DiscoverProvider:Hosts() will return the two
 	provider := New(tmpfile.Name())
 	res, err := provider.Hosts()
+	assert.NoError(t, err, "hosts call failed")
 	assert.Equal(t, []string{"127.0.0.1:3000", "127.0.0.1:3042"}, res)
 }

forward/forwarder_test.go

@@ -187,6 +187,7 @@ func (s *ForwarderTestSuite) TestForwardThrift() {
 	var response pingpong.PingPongPingResult
 
 	err = DeserializeThrift(res, &response)
+	s.NoError(err)
 
 	s.Equal("correct pinging host", response.Success.Source)
 }
@@ -211,6 +212,7 @@ func (s *ForwarderTestSuite) TestForwardThriftErrorResponse() {
 	var response pingpong.PingPongPingResult
 
 	err = DeserializeThrift(res, &response)
+	s.NoError(err)
 
 	s.NotNil(response.PingError, "expected a pingerror")
 }

swim/ping_request_test.go

@@ -172,7 +172,9 @@ func TestIndirectPing2(t *testing.T) {
 	cont := make(chan bool, 1)
 
 	tnodes := genChannelNodes(t, 4)
-	defer destroyNodes(tnodes...)
+	defer func() {
+		destroyNodes(tnodes...)
+	}()
 
 	// don't bootstrap the target
 	sender, helper1, helper2, target := tnodes[0], tnodes[1], tnodes[2], tnodes[3]