Skip to content

Commit

Permalink
go fmt
Browse files Browse the repository at this point in the history 
Signed-off-by: Josh Zarrabi <[email protected]>
  • Loading branch information
Iryna Shustava authored and Ed Espino committed May 4, 2018
1 parent cfc0dec commit bdc18a0
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 19 deletions.
1 change: 0 additions & 1 deletion cats_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func TestCATS(t *testing.T) {

Expect(ParseRawCliVersionString(installedVersion).AtLeast(ParseRawCliVersionString(minCliVersion))).To(BeTrue(), "CLI version "+minCliVersion+" is required")


if Config.GetIncludeSsh() {
ScpPath, err = exec.LookPath("scp")
Expect(err).NotTo(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion route_services/route_services.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import (
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
"github.com/cloudfoundry-incubator/cf-test-helpers/workflowhelpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
logshelper "github.com/cloudfoundry/cf-acceptance-tests/helpers/logs"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gbytes"
. "github.com/onsi/gomega/gexec"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
)

var _ = RouteServicesDescribe("Route Services", func() {
Expand Down
6 changes: 3 additions & 3 deletions routing/context_paths.go
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package routing

import (
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega/gexec"
. "github.com/onsi/gomega"
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
. "github.com/onsi/gomega/gexec"
)

var _ = RoutingDescribe("Context Paths", func() {
Expand Down
8 changes: 4 additions & 4 deletions routing/multiple_app_ports.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

"path/filepath"

"encoding/json"
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"encoding/json"
"regexp"
)

Expand Down Expand Up @@ -109,4 +109,4 @@ func createRouteMapping(appName string, hostname string, appPort uint16) {
Expect(err).ToNot(HaveOccurred())

Expect(cf.Cf("curl", fmt.Sprintf("/v2/route_mappings"), "-X", "POST", "-d", string(data)).Wait(Config.DefaultTimeoutDuration())).To(Exit(0))
}
}
6 changes: 3 additions & 3 deletions routing/session_affinity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (

. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"

"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
"github.com/onsi/gomega/gexec"
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
. "github.com/onsi/gomega/gexec"
)

var _ = RoutingDescribe("Session Affinity", func() {
Expand Down
6 changes: 3 additions & 3 deletions routing/zipkin_tracing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"fmt"
"regexp"

"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
cf_helpers "github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/logs"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
"github.com/onsi/gomega/gbytes"
"github.com/onsi/gomega/gexec"
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
. "github.com/onsi/gomega/gexec"
)

var _ = ZipkinDescribe("Zipkin Tracing", func() {
Expand Down
4 changes: 2 additions & 2 deletions tasks/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/skip_messages"

"github.com/cloudfoundry/cf-acceptance-tests/helpers/logs"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/logs"
)

const policyTimeout = "10s"
Expand Down Expand Up @@ -347,7 +347,7 @@ exit 1`
}, Config.CfPushTimeoutDuration()).Should(Equal("FAILED"))
Expect(outputName).To(Equal(taskName))

Eventually(func() string{
Eventually(func() string {
appLogs := logs.Tail(Config.GetUseLogCache(), appName).Wait(Config.DefaultTimeoutDuration())
Expect(appLogs).To(Exit(0))
return string(appLogs.Out.Contents())
Expand Down
2 changes: 1 addition & 1 deletion windows/context_paths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"github.com/cloudfoundry-incubator/cf-test-helpers/cf"
"github.com/cloudfoundry-incubator/cf-test-helpers/helpers"
. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/assets"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/skip_messages"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
"github.com/cloudfoundry/cf-acceptance-tests/helpers/app_helpers"
)

var _ = WindowsDescribe("Context Paths", func() {
Expand Down
2 changes: 1 addition & 1 deletion windows/running_security_groups_win.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package windows
import (
"encoding/json"
"fmt"
. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"
"io/ioutil"
"os"
. "github.com/cloudfoundry/cf-acceptance-tests/cats_suite_helpers"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down

0 comments on commit bdc18a0

Please sign in to comment.