This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new faec77c SCB-362 Fix UT failure (#294)
faec77c is described below
commit faec77c81b122e26ff6eff4b91cb717396297b76
Author: little-cui <[email protected]>
AuthorDate: Fri Mar 2 11:55:13 2018 +0800
SCB-362 Fix UT failure (#294)
---
server/service/instances_test.go | 14 ++++++++++-
server/service/service_dependency_test.go | 42 -------------------------------
2 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/server/service/instances_test.go b/server/service/instances_test.go
index dfba6d3..abbf5fc 100644
--- a/server/service/instances_test.go
+++ b/server/service/instances_test.go
@@ -690,7 +690,8 @@ var _ = Describe("'Instance' service", func() {
Expect(respCreate.Response.Code).To(Equal(pb.Response_SUCCESS))
serviceId7 = respCreate.ServiceId
- respCreate, err =
serviceResource.Create(util.SetDomainProject(context.Background(), "user",
"user"),
+ respCreate, err = serviceResource.Create(
+
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
&pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "default",
@@ -933,6 +934,17 @@ var _ = Describe("'Instance' service", func() {
Expect(len(respFind.Instances)).To(Equal(1))
Expect(respFind.Instances[0].InstanceId).To(Equal(instanceId5))
+ By("get same domain deps")
+ respGetC, err :=
serviceResource.GetConsumerDependencies(
+
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
+ &pb.GetDependenciesRequest{
+ ServiceId: serviceId6,
+ SameDomain: true,
+ })
+ Expect(err).To(BeNil())
+
Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
+ Expect(len(respGetC.Providers)).To(Equal(0))
+
core.Service.Environment = pb.ENV_DEV
})
})
diff --git a/server/service/service_dependency_test.go
b/server/service/service_dependency_test.go
index d96304b..04f8c25 100644
--- a/server/service/service_dependency_test.go
+++ b/server/service/service_dependency_test.go
@@ -17,12 +17,10 @@
package service_test
import (
- "github.com/apache/incubator-servicecomb-service-center/pkg/util"
pb
"github.com/apache/incubator-servicecomb-service-center/server/core/proto"
"github.com/apache/incubator-servicecomb-service-center/server/service/event"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "golang.org/x/net/context"
)
var deh event.DependencyEventHandler
@@ -412,7 +410,6 @@ var _ = Describe("'Dependency' service", func() {
Describe("execute 'get' operartion", func() {
var (
consumerId1 string
- consumerId2 string
providerId1 string
providerId2 string
)
@@ -431,21 +428,6 @@ var _ = Describe("'Dependency' service", func() {
Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
consumerId1 = respCreateService.ServiceId
- respCreateService, err =
serviceResource.Create(util.SetDomainProject(context.Background(), "user",
"user"),
- &pb.CreateServiceRequest{
- Service: &pb.MicroService{
- Environment: pb.ENV_DEV,
- AppId: "get_dep_group",
- ServiceName:
"get_same_domain_dep_consumer",
- Version: "1.0.0",
- Level: "FRONT",
- Status: pb.MS_UP,
- },
- })
- Expect(err).To(BeNil())
-
Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
- consumerId2 = respCreateService.ServiceId
-
respCreateService, err =
serviceResource.Create(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "get_dep_group",
@@ -599,30 +581,6 @@ var _ = Describe("'Dependency' service", func() {
Expect(err).To(BeNil())
Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
Expect(len(respGetC.Providers)).To(Equal(1))
-
- By("get same domain deps")
- respFind, err := instanceResource.Find(
- util.SetTargetDomainProject(
-
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
- "default", "default"),
- &pb.FindInstancesRequest{
- ConsumerServiceId: consumerId2,
- AppId: "default",
- ServiceName:
"SERVICECENTER",
- VersionRule: "latest",
- })
- Expect(err).To(BeNil())
-
Expect(respFind.Response.Code).To(Equal(pb.Response_SUCCESS))
-
- respGetC, err =
serviceResource.GetConsumerDependencies(
-
util.SetDomainProject(context.Background(), "user", "user"),
- &pb.GetDependenciesRequest{
- ServiceId: consumerId2,
- SameDomain: true,
- })
- Expect(err).To(BeNil())
-
Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
- Expect(len(respGetC.Providers)).To(Equal(0))
})
})
})
--
To stop receiving notification emails like this one, please contact
[email protected].
