Fix flaky test

plugin/grpc/grpctrace/grpc_test.go

@@ -89,12 +89,6 @@ func (t *testExporter) ExportSpan(s *trace.SpanData) {
 }
 
 func TestSpanCreation(t *testing.T) {
-	client, _, cleanup, err := newTestClientAndServer()
-	if err != nil {
-		t.Fatalf("initializing client and server: %v", err)
-	}
-	defer cleanup()
-
 	trace.SetDefaultSampler(trace.AlwaysSample())
 	te := testExporter{make(chan *trace.SpanData)}
 	trace.RegisterExporter(&te)
@@ -109,6 +103,10 @@ func TestSpanCreation(t *testing.T) {
 		{false, false},
 		{false, true},
 	} {
+		client, _, cleanup, err := newTestClientAndServer()
+		if err != nil {
+			t.Fatalf("initializing client and server: %v", err)
+		}
 		var methodName string
 		if test.streaming {
 			methodName = ".testdata.Foo.Multiple"
@@ -133,7 +131,7 @@ func TestSpanCreation(t *testing.T) {
 				if err != nil {
 					t.Fatalf("%#v: couldn't send streaming request: %v", test, err)
 				}
-				_, err := stream.Recv()
+				_, err = stream.Recv()
 				if err != nil {
 					t.Errorf("%#v: couldn't receive streaming response: %v", test, err)
 				}
@@ -158,6 +156,8 @@ func TestSpanCreation(t *testing.T) {
 			}
 		}
 
+		cleanup()
+
 		// get the client- and server-side spans from the exporter.
 		s2 := <-te.ch
 		s1 := <-te.ch