Revert "Use the cf.Push helper everywhere"

This reverts commit 6c01d6b. Co-authored-by: Andrew Costa <[email protected]>
cloudfoundry · Jul 8, 2020 · 5cba29d · 5cba29d
1 parent 8ca6197
commit 5cba29d
Show file tree

Hide file tree

Showing 56 changed files with 166 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -396,7 +396,7 @@ unless the test specifically needs to use a buildpack name or URL specific to th
   For example:
 
   ```go
-  Expect(cf.Push(appName,
+  Expect(cf.Cf("push", appName,
       "-b", buildpackName,                  // specify buildpack
       "-m", DEFAULT_MEMORY_LIMIT,           // specify memory limit
       "-d", Config.AppsDomain,              // specify app domain

diff --git a/apps/admin_buildpack_lifecycle.go b/apps/admin_buildpack_lifecycle.go
@@ -267,15 +267,15 @@ exit 1
 	}
 
 	itIsUsedForTheApp := func() {
-		push := cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
+		push := cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
 
 		Expect(push).To(Exit(0))
 		appOutput := cf.Cf("app", appName).Wait()
 		Expect(appOutput).To(Say("buildpacks?:\\s+Simple"))
 	}
 
 	itDoesNotDetectForEmptyApp := func() {
-		push := cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
+		push := cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
 
 		Expect(push).To(Exit(1))
 		Expect(combineOutput(push.Out, push.Err)).To(Say(noAppDetectedErrorRegexp))
@@ -286,7 +286,7 @@ exit 1
 			Expect(cf.Cf("update-buildpack", buildpackName, "--disable").Wait()).To(Exit(0))
 		})
 
-		push := cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
+		push := cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
 		Expect(push).To(Exit(1))
 		Expect(combineOutput(push.Out, push.Err)).To(Say(noAppDetectedErrorRegexp))
 	}
@@ -312,7 +312,7 @@ exit 1
 	}
 
 	itRaisesBuildpackReleaseFailedError := func() {
-		push := cf.Push(appName, "-b", buildpackName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
+		push := cf.Cf("push", appName, "-b", buildpackName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
 		Expect(push).To(Exit(1))
 		Expect(combineOutput(push.Out, push.Err)).To(Say(buildpackReleaseFailedRegexp))
 	}
@@ -354,7 +354,7 @@ exit 1
 				Expect(cf.Cf("update-buildpack", buildpackName, "--disable").Wait()).To(Exit(0))
 			})
 
-			Expect(cf.Push(appName, "-b", buildpackName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(1))
+			Expect(cf.Cf("push", appName, "-b", buildpackName, "-m", DEFAULT_MEMORY_LIMIT, "-p", appPath, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(1))
 		})
 	})
 

diff --git a/apps/app_bits_copy.go b/apps/app_bits_copy.go
@@ -21,14 +21,14 @@ var _ = AppsDescribe("Copy app bits", func() {
 		golangAppName = random_name.CATSRandomName("APP")
 		helloWorldAppName = random_name.CATSRandomName("APP")
 
-		Expect(cf.Push(golangAppName,
+		Expect(cf.Cf("push", golangAppName,
 			"--no-start",
 			"-b", Config.GetRubyBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().Golang,
 			"-d", Config.GetAppsDomain(),
 		).Wait()).To(Exit(0))
-		Expect(cf.Push(helloWorldAppName,
+		Expect(cf.Cf("push", helloWorldAppName,
 			"--no-start",
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().HelloWorld,

diff --git a/apps/app_stack.go b/apps/app_stack.go
@@ -136,7 +136,7 @@ EOF
 					expectedLSBRelease = "DISTRIB_CODENAME=bionic"
 				}
 
-				push := cf.Push(appName,
+				push := cf.Cf("push", appName,
 					"-b", buildpackName,
 					"-m", DEFAULT_MEMORY_LIMIT,
 					"-p", appPath,

diff --git a/apps/app_staging_environment.go b/apps/app_staging_environment.go
@@ -120,7 +120,7 @@ EOF
 	})
 
 	It("uses a ruby binary for staging", func() {
-		push := cf.Push(appName,
+		push := cf.Cf("push", appName,
 			"-b", BuildpackName,
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", appPath,

diff --git a/apps/buildpack_cache.go b/apps/buildpack_cache.go
@@ -123,7 +123,7 @@ EOF
 	})
 
 	It("uses the buildpack cache after first staging", func() {
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push", appName,
 			"-b", BuildpackName,
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", appPath,

diff --git a/apps/changing_start_command.go b/apps/changing_start_command.go
@@ -93,7 +93,7 @@ var _ = AppsDescribe("Changing an app's start command", func() {
 		}
 
 		BeforeEach(func() {
-			Expect(cf.Push(appName, "-b", Config.GetNodejsBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().NodeWithProcfile, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-b", Config.GetNodejsBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().NodeWithProcfile, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 		})
 
 		It("detects the use of the start command in the 'web' process type", func() {

diff --git a/apps/delete_route.go b/apps/delete_route.go
@@ -27,7 +27,8 @@ var _ = AppsDescribe("Delete Route", func() {
 		nullSession := helpers.CurlSkipSSL(Config.GetSkipSSLValidation(), appUrl).Wait()
 		expectedNullResponse = string(nullSession.Buffer().Contents())
 
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"-b", Config.GetBinaryBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().Catnip,

diff --git a/apps/droplet_uploading_and_downloading.go b/apps/droplet_uploading_and_downloading.go
@@ -55,7 +55,7 @@ var _ = AppsDescribe("Uploading and Downloading droplets", func() {
 	BeforeEach(func() {
 		helloWorldAppName = random_name.CATSRandomName("APP")
 
-		Expect(cf.Push(helloWorldAppName, "-b", Config.GetRubyBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().HelloWorld, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+		Expect(cf.Cf("push", helloWorldAppName, "-b", Config.GetRubyBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().HelloWorld, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 	})
 
 	AfterEach(func() {
@@ -77,7 +77,7 @@ var _ = AppsDescribe("Uploading and Downloading droplets", func() {
 		unpackTarball(appDropletPathToCompressedFile)
 
 		By("Pushing a different version of the app")
-		Expect(cf.Push(helloWorldAppName, "-p", assets.NewAssets().RubySimple).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+		Expect(cf.Cf("push", helloWorldAppName, "-p", assets.NewAssets().RubySimple).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 		Eventually(func() string {
 			return helpers.CurlAppRoot(Config, helloWorldAppName)
 		}).Should(ContainSubstring("Healthy"))

diff --git a/apps/encoding.go b/apps/encoding.go
@@ -18,7 +18,8 @@ var _ = AppsDescribe("Encoding", func() {
 
 	BeforeEach(func() {
 		appName = random_name.CATSRandomName("APP")
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"--no-start",
 			"-b", Config.GetJavaBuildpackName(),
 			"-p", assets.NewAssets().Java,

diff --git a/apps/environment_variables_group.go b/apps/environment_variables_group.go
@@ -130,7 +130,7 @@ exit 1
 				Expect(cf.Cf("create-buildpack", buildpackName, buildpackZip, "999").Wait()).To(Exit(0))
 			})
 
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-b", buildpackName, "-p", assets.NewAssets().HelloWorld, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(1))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-b", buildpackName, "-p", assets.NewAssets().HelloWorld, "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(1))
 
 			Eventually(logs.Tail(Config.GetUseLogCache(), appName)).Should(Say(envVarValue))
 		})
@@ -161,7 +161,8 @@ exit 1
 				extendEnv("running", envVarName, envVarValue)
 			})
 
-			Expect(cf.Push(appName,
+			Expect(cf.Cf("push",
+				appName,
 				"-b", Config.GetBinaryBuildpackName(),
 				"-m", DEFAULT_MEMORY_LIMIT,
 				"-p", assets.NewAssets().Catnip,

diff --git a/apps/instance_reporting.go b/apps/instance_reporting.go
@@ -58,7 +58,8 @@ var _ = AppsDescribe("Getting instance information", func() {
 		BeforeEach(func() {
 			appName = random_name.CATSRandomName("APP")
 
-			Expect(cf.Push(appName,
+			Expect(cf.Cf("push",
+				appName,
 				"-b", Config.GetBinaryBuildpackName(),
 				"-m", DEFAULT_MEMORY_LIMIT,
 				"-p", assets.NewAssets().Catnip,

diff --git a/apps/large_payload.go b/apps/large_payload.go
@@ -25,7 +25,8 @@ var _ = AppsDescribe("Large_payload", func() {
 	})
 	It("should be able to curl for a large response body", func() {
 		appName = random_name.CATSRandomName("APP")
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"-b", Config.GetBinaryBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().Catnip,

diff --git a/apps/loggregator.go b/apps/loggregator.go
@@ -42,7 +42,8 @@ var _ = AppsDescribe("loggregator", func() {
 	BeforeEach(func() {
 		appName = CATSRandomName("APP")
 
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"-b", Config.GetRubyBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().LoggregatorLoadGenerator,

diff --git a/apps/output_volume.go b/apps/output_volume.go
@@ -20,7 +20,8 @@ var _ = AppsDescribe("An application printing a bunch of output", func() {
 	BeforeEach(func() {
 		appName = random_name.CATSRandomName("APP")
 
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"-b", Config.GetBinaryBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().Catnip,

diff --git a/apps/routing_transparency.go b/apps/routing_transparency.go
@@ -19,7 +19,8 @@ var _ = AppsDescribe("Routing Transparency", func() {
 
 	BeforeEach(func() {
 		appName = random_name.CATSRandomName("APP")
-		Expect(cf.Push(appName,
+		Expect(cf.Cf("push",
+			appName,
 			"-b", Config.GetGoBuildpackName(),
 			"-p", assets.NewAssets().Golang,
 			"-f", filepath.Join(assets.NewAssets().Golang, "manifest.yml"),

diff --git a/apps/staging_log.go b/apps/staging_log.go
@@ -29,7 +29,8 @@ var _ = AppsDescribe("An application being staged", func() {
 	})
 
 	It("has its staging log streamed during a push", func() {
-		push := cf.Push(appName,
+		push := cf.Cf("push",
+			appName,
 			"-b", Config.GetBinaryBuildpackName(),
 			"-m", DEFAULT_MEMORY_LIMIT,
 			"-p", assets.NewAssets().Catnip,

diff --git a/credhub/service_bindings.go b/credhub/service_bindings.go
@@ -192,7 +192,7 @@ EOF
 				Expect(createBuildpack).Should(Say("OK"))
 
 			})
-			Expect(cf.Push(appName,
+			Expect(cf.Cf("push", appName,
 				"--no-start",
 				"-b", buildpackName,
 				"-m", DEFAULT_MEMORY_LIMIT,

diff --git a/detect/buildpacks.go b/detect/buildpacks.go
@@ -32,7 +32,8 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("ruby", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName,
+			Expect(cf.Cf("push",
+				appName,
 				"-m", DEFAULT_MEMORY_LIMIT,
 				"-p", assets.NewAssets().HelloWorld,
 				"-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
@@ -45,7 +46,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("node", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Node, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Node, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -55,7 +56,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("java", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "--no-start", "-p", assets.NewAssets().Java, "-m", "1024M", "-d", Config.GetAppsDomain()).Wait()).To(Exit(0))
+			Expect(cf.Cf("push", appName, "--no-start", "-p", assets.NewAssets().Java, "-m", "1024M", "-d", Config.GetAppsDomain()).Wait()).To(Exit(0))
 			Expect(cf.Cf("set-env", appName, "JAVA_OPTS", "-Djava.security.egd=file:///dev/urandom").Wait()).To(Exit(0))
 			Expect(cf.Cf("start", appName).Wait(CF_JAVA_TIMEOUT)).To(Exit(0))
 
@@ -67,7 +68,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("golang", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Golang, "-f", filepath.Join(assets.NewAssets().Golang, "manifest.yml"), "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Golang, "-f", filepath.Join(assets.NewAssets().Golang, "manifest.yml"), "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -77,7 +78,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("python", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Python, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Python, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -94,7 +95,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 		})
 
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Php, "-d", Config.GetAppsDomain()).Wait(phpPushTimeout)).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Php, "-d", Config.GetAppsDomain()).Wait(phpPushTimeout)).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -107,7 +108,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 		// from the dotnet core buildpack until end of the version's LTS in 2019
 
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().DotnetCore, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().DotnetCore, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -117,7 +118,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("staticfile", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Staticfile, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Staticfile, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)
@@ -127,7 +128,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("binary", func() {
 		It("makes the app reachable via its bound route", func() {
-			Expect(cf.Push(appName, "-b", Config.GetBinaryBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Binary, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+			Expect(cf.Cf("push", appName, "-b", Config.GetBinaryBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Binary, "-d", Config.GetAppsDomain()).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
 
 			Eventually(func() string {
 				return helpers.CurlAppRoot(Config, appName)

diff --git a/docker/credhub_enabled.go b/docker/credhub_enabled.go
@@ -29,7 +29,7 @@ var _ = DockerDescribe("Docker App Lifecycle CredHub Integration", func() {
 
 			chBrokerName = random_name.CATSRandomName("BRKR-CH")
 
-			pushBroker := cf.Push(chBrokerName, "-b", Config.GetGoBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().CredHubServiceBroker, "-f", assets.NewAssets().CredHubServiceBroker+"/manifest.yml", "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
+			pushBroker := cf.Cf("push", chBrokerName, "-b", Config.GetGoBuildpackName(), "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().CredHubServiceBroker, "-f", assets.NewAssets().CredHubServiceBroker+"/manifest.yml", "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())
 			Expect(pushBroker).To(Exit(0), "failed pushing credhub-enabled service broker")
 
 			existingEnvVar := string(cf.Cf("running-environment-variable-group").Wait().Out.Contents())

diff --git a/internet_dependent/app_dns_resolution.go b/internet_dependent/app_dns_resolution.go
@@ -25,7 +25,8 @@ type CatnipCurlResponse struct {
 }
 
 func pushApp(appName, buildpack string) {
-	Expect(cf.Push(appName,
+	Expect(cf.Cf("push",
+		appName,
 		"-b", buildpack,
 		"-m", DEFAULT_MEMORY_LIMIT,
 		"-p", assets.NewAssets().Catnip,

diff --git a/internet_dependent/git_buildpack.go b/internet_dependent/git_buildpack.go
@@ -20,7 +20,7 @@ var _ = InternetDependentDescribe("GitBuildpack", func() {
 
 	It("uses a buildpack from a git url", func() {
 		appName = random_name.CATSRandomName("APP")
-		Expect(cf.Push(appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Node, "-b", "https://github.com/cloudfoundry/nodejs-buildpack.git#v1.3.1", "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+		Expect(cf.Cf("push", appName, "-m", DEFAULT_MEMORY_LIMIT, "-p", assets.NewAssets().Node, "-b", "https://github.com/cloudfoundry/nodejs-buildpack.git#v1.3.1", "-d", Config.GetAppsDomain()).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 
 		Eventually(func() string {
 			return helpers.CurlAppRoot(Config, appName)

diff --git a/internetless/app_external_traffic_denied.go b/internetless/app_external_traffic_denied.go
@@ -25,7 +25,8 @@ type CatnipCurlResponse struct {
 }
 
 func pushApp(appName, buildpack string) {
-	Expect(cf.Push(appName,
+	Expect(cf.Cf("push",
+		appName,
 		"-b", buildpack,
 		"-m", DEFAULT_MEMORY_LIMIT,
 		"-p", assets.NewAssets().Catnip,

diff --git a/route_services/route_services.go b/route_services/route_services.go
@@ -45,7 +45,8 @@ var _ = RouteServicesDescribe("Route Services", func() {
 				createServiceBroker(brokerName, brokerAppName, serviceName)
 				createServiceInstance(serviceInstanceName, serviceName)
 
-				Expect(cf.Push(appName,
+				Expect(cf.Cf("push",
+					appName,
 					"-b", Config.GetGoBuildpackName(),
 					"-m", DEFAULT_MEMORY_LIMIT,
 					"-p", golangAsset,
@@ -109,7 +110,8 @@ var _ = RouteServicesDescribe("Route Services", func() {
 				createServiceBroker(brokerName, brokerAppName, serviceName)
 				createServiceInstance(serviceInstanceName, serviceName)
 
-				Expect(cf.Push(appName,
+				Expect(cf.Cf("push",
+					appName,
 					"-b", Config.GetGoBuildpackName(),
 					"-m", DEFAULT_MEMORY_LIMIT,
 					"-p", golangAsset,
@@ -255,7 +257,8 @@ func configureBroker(serviceBrokerAppName, routeServiceName string) {
 
 func createServiceBroker(brokerName, brokerAppName, serviceName string) {
 	serviceBrokerAsset := assets.NewAssets().ServiceBroker
-	Expect(cf.Push(brokerAppName,
+	Expect(cf.Cf("push",
+		brokerAppName,
 		"-b", Config.GetRubyBuildpackName(),
 		"-m", DEFAULT_MEMORY_LIMIT,
 		"-p", serviceBrokerAsset,