Merge pull request #568 from uber/lu.race

Use Shutdown for stopping test server
uber · Feb 16, 2019 · 56c1508 · 56c1508
2 parents fa94472 + a910ed2
commit 56c1508
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/service_mock.tmpl b/codegen/templates/service_mock.tmpl
@@ -130,7 +130,7 @@ func (m *mockService) Stop() {
 	// m.ctrl.Finish() calls runtime.Goexit() on errors
 	// put it in defer so cleanup is always done
 	defer func(){
-		m.server.Close()
+		m.server.Shutdown()
 		m.started = false
 	}()
 	m.ctrl.Finish()

diff --git a/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go b/examples/example-gateway/build/app/demo/services/xyz/mock-service/mock_service.go
diff --git a/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go b/examples/example-gateway/build/services/echo-gateway/mock-service/mock_service.go
diff --git a/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go b/examples/example-gateway/build/services/example-gateway/mock-service/mock_service.go
diff --git a/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go b/test/endpoints/tchannel/baz/baz_simpleservice_method_call_test.go
@@ -252,8 +252,6 @@ func TestCallTChannelTimeout(t *testing.T) {
 	assert.Nil(t, resHeaders)
 	assert.False(t, success)
 
-	allLogs := gateway.AllLogs()
-	assert.Len(t, allLogs, 10)
 	assert.Len(t, gateway.Logs("info", "Started ExampleGateway"), 1)
 	assert.Len(t, gateway.Logs("info", "Created new active connection."), 2)