Merge pull request #37166 from yongtang/05282018-unique-service-name

Add `t.Name()` to tests so that service names are unique
Upstream-commit: 864b36255dce627443b18e7e44549d506a71f14a
Component: engine

components/engine/integration/network/inspect_test.go

@@ -34,7 +34,7 @@ func TestInspectNetwork(t *testing.T) {
 	overlayID := netResp.ID
 
 	var instances uint64 = 4
-	serviceName := "TestService"
+	serviceName := "TestService" + t.Name()
 
 	serviceID := swarm.CreateService(t, d,
 		swarm.ServiceWithReplicas(instances),

components/engine/integration/network/service_test.go

@@ -207,7 +207,7 @@ func TestServiceWithPredefinedNetwork(t *testing.T) {
 
 	hostName := "host"
 	var instances uint64 = 1
-	serviceName := "TestService"
+	serviceName := "TestService" + t.Name()
 
 	serviceID := swarm.CreateService(t, d,
 		swarm.ServiceWithReplicas(instances),