From e70b6c26cb7e710b69512b5c7c8c12ad05b08c16 Mon Sep 17 00:00:00 2001 From: Lattice Continuous Deployment Date: Thu, 12 Mar 2015 19:56:22 +0000 Subject: [PATCH] Update ltc Godeps Diego Release Git SHA: fe3f16d0b101098f41b792ebf5f0f6029b7f111b +Committed by GOCD- Run #738 of Pipeline: diego-edge, Stage: promote_and_publish, JOB: promote_and_publish --- ltc/Godeps/Godeps.json | 6 ++--- .../cf_http/cf_http_test.go | 25 ++++++++----------- .../receptor/cmd/receptor/actual_lrp_test.go | 2 +- .../receptor/cmd/receptor/event_test.go | 4 +-- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ltc/Godeps/Godeps.json b/ltc/Godeps/Godeps.json index bab4a55e..463216f7 100644 --- a/ltc/Godeps/Godeps.json +++ b/ltc/Godeps/Godeps.json @@ -17,15 +17,15 @@ }, { "ImportPath": "github.com/cloudfoundry-incubator/cf_http", - "Rev": "bcec9f0c06dc0f60dfe259061c329a69dedfe128" + "Rev": "db1bf7202e706de8d7460c1b54494ac7ab481a59" }, { "ImportPath": "github.com/cloudfoundry-incubator/receptor", - "Rev": "50c2b8de1da28432d8d381078647b4eb35dba86b" + "Rev": "14df1a83453bdee36fdaf6c1b6dfbc0d72096027" }, { "ImportPath": "github.com/cloudfoundry-incubator/runtime-schema/models", - "Rev": "ecac5cddfba5437c5b371d7c78725063c03969d1" + "Rev": "cb692d996d3a1c659eac5153eeb4e1ed9ac2fc52" }, { "ImportPath": "github.com/cloudfoundry/noaa", diff --git a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/cf_http/cf_http_test.go b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/cf_http/cf_http_test.go index d767402e..5c906440 100644 --- a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/cf_http/cf_http_test.go +++ b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/cf_http/cf_http_test.go @@ -12,25 +12,22 @@ import ( var _ = Describe("CfHttp", func() { Describe("NewClient", func() { - Context("when a default timeout has been initialized", func() { - var timeout time.Duration + var timeout time.Duration - BeforeEach(func() { - timeout = 1 * time.Second - cf_http.Initialize(timeout) - }) - - It("returns an http client with the default timeout set", func() { - Ω(*cf_http.NewClient()).Should(Equal(http.Client{ - Timeout: timeout, - })) - }) + BeforeEach(func() { + timeout = 1 * time.Second }) - Context("when nothing has been initialized", func() { - It("returns a DefaultClient-equivalent http client", func() { + It("returns an http client", func() { + By("Getting a client before initializaqtion", func() { Ω(*cf_http.NewClient()).Should(Equal(*http.DefaultClient)) }) + + cf_http.Initialize(timeout) + + Ω(*cf_http.NewClient()).Should(Equal(http.Client{ + Timeout: timeout, + })) }) }) }) diff --git a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/actual_lrp_test.go b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/actual_lrp_test.go index 5494a6a7..3af96031 100644 --- a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/actual_lrp_test.go +++ b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/actual_lrp_test.go @@ -55,7 +55,7 @@ var _ = Describe("Actual LRP API", func() { evacuatingLRPKey = models.NewActualLRPKey("process-guid-0", 0, "domain-0") containerKey := models.NewActualLRPContainerKey("instance-guid-0", "cell-id") netInfo := models.NewActualLRPNetInfo("the-host", []models.PortMapping{{ContainerPort: 80, HostPort: 1000}}) - err = bbs.EvacuateRunningActualLRP(logger, evacuatingLRPKey, containerKey, netInfo, 0) + _, err = bbs.EvacuateRunningActualLRP(logger, evacuatingLRPKey, containerKey, netInfo, 0) Ω(err).Should(Equal(bbserrors.ErrServiceUnavailable)) }) diff --git a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/event_test.go b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/event_test.go index d98ac538..d7fbf8fd 100644 --- a/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/event_test.go +++ b/ltc/Godeps/_workspace/src/github.com/cloudfoundry-incubator/receptor/cmd/receptor/event_test.go @@ -215,7 +215,7 @@ var _ = Describe("Event", func() { Ω(actualLRPChangedEvent.After).Should(Equal(serialization.ActualLRPToResponse(actualLRP, false))) By("evacuating the ActualLRP") - err = bbs.EvacuateRunningActualLRP(logger, key, containerKey, netInfo, 0) + _, err = bbs.EvacuateRunningActualLRP(logger, key, containerKey, netInfo, 0) Ω(err).Should(Equal(bbserrors.ErrServiceUnavailable)) evacuatingLRP, err := bbs.EvacuatingActualLRPByProcessGuidAndIndex(desiredLRP.ProcessGuid, 0) @@ -238,7 +238,7 @@ var _ = Describe("Event", func() { Eventually(events).Should(Receive()) evacuatingBefore := evacuatingLRP - err = bbs.EvacuateRunningActualLRP(logger, key, newContainerKey, netInfo, 0) + _, err = bbs.EvacuateRunningActualLRP(logger, key, newContainerKey, netInfo, 0) Ω(err).Should(Equal(bbserrors.ErrServiceUnavailable)) evacuatingLRP, err = bbs.EvacuatingActualLRPByProcessGuidAndIndex(desiredLRP.ProcessGuid, 0)