Revert to using cf logs for app output check

menehune23 · menehune23 · commit 5ef520801347 · 2021-12-01T16:39:50.000-08:00
For tests that expect the app to fail, using app.Stdout.String() doesn't have the desired effect. To get the full logs,
use 'cf logs --recent'.
diff --git a/src/python/integration/deploy_a_python_app_test.go b/src/python/integration/deploy_a_python_app_test.go
@@ -1,10 +1,10 @@
 package integration_test
 
 import (
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strconv"
-	"time"
 
 	"github.com/blang/semver"
 	"github.com/cloudfoundry/libbuildpack"
@@ -37,11 +37,14 @@ var _ = Describe("CF Python Buildpack", func() {
 		It("displays a nice error messages and gracefully fails", func() {
 			Expect(app.Push()).ToNot(Succeed())
 
-			Eventually(app.Stdout.String(), 60*time.Second).Should(ContainSubstring("-----> Python Buildpack version"))
-			Expect(app.ConfirmBuildpack(buildpackVersion)).To(Succeed())
+			logs := exec.Command("cf", "logs", "--recent", app.Name)
+			out, err := logs.CombinedOutput()
+			Expect(err).ToNot(HaveOccurred())
+
+			Expect(out).To(ContainSubstring("-----> Python Buildpack version " + buildpackVersion))
 
-			Eventually(app.Stdout.String()).Should(ContainSubstring("Could not install python: no match found for 99.99.99"))
-			Eventually(app.Stdout.String()).ShouldNot(ContainSubstring("-----> Installing python"))
+			Expect(out).To(ContainSubstring("Could not install python: no match found for 99.99.99"))
+			Expect(out).ToNot(ContainSubstring("-----> Installing python"))
 		})
 	})
 
diff --git a/src/python/integration/override_yml_test.go b/src/python/integration/override_yml_test.go
@@ -1,7 +1,7 @@
 package integration_test
 
 import (
-	"time"
+	"os/exec"
 
 	"github.com/cloudfoundry/libbuildpack/cutlass"
 
@@ -43,12 +43,15 @@ var _ = Describe("override yml", func() {
 	It("Forces python from override buildpack", func() {
 		Expect(app.Push()).ToNot(Succeed())
 
-		Eventually(app.Stdout.String(), 60*time.Second).Should(ContainSubstring("-----> OverrideYML Buildpack"))
-		Eventually(app.Stdout.String(), 60*time.Second).Should(ContainSubstring("-----> Python Buildpack version"))
-		Expect(app.ConfirmBuildpack(buildpackVersion)).To(Succeed())
+		logs := exec.Command("cf", "logs", "--recent", app.Name)
+		out, err := logs.CombinedOutput()
+		Expect(err).ToNot(HaveOccurred())
 
-		Eventually(app.Stdout.String()).Should(ContainSubstring("-----> Installing python"))
-		Eventually(app.Stdout.String()).Should(MatchRegexp("Copy .*/python.tgz"))
-		Eventually(app.Stdout.String()).Should(ContainSubstring("Could not install python: dependency sha256 mismatch: expected sha256 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc, actual sha256 b56b58ac21f9f42d032e1e4b8bf8b8823e69af5411caa15aee2b140bc756962f"))
+		Expect(out).To(ContainSubstring("-----> OverrideYML Buildpack"))
+		Expect(out).To(ContainSubstring("-----> Python Buildpack version "+buildpackVersion))
+
+		Expect(out).To(ContainSubstring("-----> Installing python"))
+		Expect(out).To(MatchRegexp("Copy .*/python.tgz"))
+		Expect(out).To(ContainSubstring("Could not install python: dependency sha256 mismatch: expected sha256 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc, actual sha256 b56b58ac21f9f42d032e1e4b8bf8b8823e69af5411caa15aee2b140bc756962f"))
 	})
 })
