diff --git a/cats_suite_test.go b/cats_suite_test.go index a9246b43f..7a38d8d3e 100644 --- a/cats_suite_test.go +++ b/cats_suite_test.go @@ -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()) diff --git a/route_services/route_services.go b/route_services/route_services.go index 81b0a872f..2d64e041d 100644 --- a/route_services/route_services.go +++ b/route_services/route_services.go @@ -11,6 +11,7 @@ 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" @@ -18,7 +19,6 @@ import ( . "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() { diff --git a/routing/context_paths.go b/routing/context_paths.go index 783c700ab..119c20d72 100644 --- a/routing/context_paths.go +++ b/routing/context_paths.go @@ -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() { diff --git a/routing/multiple_app_ports.go b/routing/multiple_app_ports.go index 4ea79af39..02cb7669e 100644 --- a/routing/multiple_app_ports.go +++ b/routing/multiple_app_ports.go @@ -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" ) @@ -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)) -} \ No newline at end of file +} diff --git a/routing/session_affinity.go b/routing/session_affinity.go index a96ad15cb..4bef34edf 100644 --- a/routing/session_affinity.go +++ b/routing/session_affinity.go @@ -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() { diff --git a/routing/zipkin_tracing.go b/routing/zipkin_tracing.go index bb69c02db..0c1df516e 100644 --- a/routing/zipkin_tracing.go +++ b/routing/zipkin_tracing.go @@ -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() { diff --git a/tasks/task.go b/tasks/task.go index 98382a720..81e36da8b 100644 --- a/tasks/task.go +++ b/tasks/task.go @@ -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" @@ -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()) diff --git a/windows/context_paths.go b/windows/context_paths.go index 83e88fdd4..65f94d61f 100644 --- a/windows/context_paths.go +++ b/windows/context_paths.go @@ -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() { diff --git a/windows/running_security_groups_win.go b/windows/running_security_groups_win.go index 5eac85eb5..133724fb2 100644 --- a/windows/running_security_groups_win.go +++ b/windows/running_security_groups_win.go @@ -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"