Skip to content

Commit

Permalink
Remove redundant code
Browse files Browse the repository at this point in the history
  • Loading branch information
@x-cray
x-cray committed Aug 30, 2016
1 parent b92f07a commit 6a58be9
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 69 deletions.
72 changes: 36 additions & 36 deletions bridge/bridge_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ var _ = Describe("Bridge", func() {
It("Should do nothing if service sets in scheduler and registry match", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
Healthy: true,
Expand All @@ -119,11 +119,11 @@ var _ = Describe("Bridge", func() {
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand All @@ -134,22 +134,22 @@ var _ = Describe("Bridge", func() {
},
}
registryServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
ExposedPort: 31045,
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
ExposedPort: 31046,
Expand Down Expand Up @@ -177,11 +177,11 @@ var _ = Describe("Bridge", func() {
It("Should register 1 service absent from registry but present in scheduler", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
Healthy: true,
Expand All @@ -190,11 +190,11 @@ var _ = Describe("Bridge", func() {
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand All @@ -205,11 +205,11 @@ var _ = Describe("Bridge", func() {
},
}
registryServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
ExposedPort: 31046,
Expand Down Expand Up @@ -243,11 +243,11 @@ var _ = Describe("Bridge", func() {
It("Should deregister 1 service absent from scheduler but present in registry", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand All @@ -258,22 +258,22 @@ var _ = Describe("Bridge", func() {
},
}
registryServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
ExposedPort: 31045,
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
ExposedPort: 31046,
Expand Down Expand Up @@ -307,11 +307,11 @@ var _ = Describe("Bridge", func() {
It("Should deregister 1 service (with colliding exposed port number) absent from scheduler but present in registry", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand All @@ -322,22 +322,22 @@ var _ = Describe("Bridge", func() {
},
}
registryServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
ExposedPort: 31046,
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
ExposedPort: 31046,
Expand Down Expand Up @@ -371,11 +371,11 @@ var _ = Describe("Bridge", func() {
It("Should register 2 services absent from registry but present in scheduler", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
Healthy: true,
Expand All @@ -384,11 +384,11 @@ var _ = Describe("Bridge", func() {
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand Down Expand Up @@ -429,11 +429,11 @@ var _ = Describe("Bridge", func() {
It("Should not try to register services from address different than registry advertized one", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
Healthy: true,
Expand All @@ -442,11 +442,11 @@ var _ = Describe("Bridge", func() {
},
},
},
&types.ServiceGroup{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799",
IP: "10.10.10.20",
Services: []*types.Service{
&types.Service{
{
ID: "app_server_5877d4d2-7b4b-11e5-b945-56847afe9799:3000",
Name: "app-server",
Healthy: true,
Expand Down Expand Up @@ -483,11 +483,11 @@ var _ = Describe("Bridge", func() {
It("Should not try to register unhealthy services", func() {
// Arrange.
schedulerServices := []*types.ServiceGroup{
&types.ServiceGroup{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799",
IP: "10.10.10.10",
Services: []*types.Service{
&types.Service{
{
ID: "db_server_2c033893-7993-11e5-8878-56847afe9799:27017",
Name: "db-server",
Healthy: false,
Expand Down
Loading

0 comments on commit 6a58be9

Please sign in to comment.