stembuild: use explict Ginkgo WithTimeout format

Author: aramprice

stembuild/integration/construct/construct_test.go

@@ -51,21 +51,21 @@ var _ = Describe("stembuild construct", func() {
 			session := helpers.Stembuild(stembuildExecutable, "construct", "-vm-ip", conf.TargetIP, "-vm-username", conf.VMUsername, "-vm-password", conf.VMPassword, "-vcenter-url", conf.VCenterURL, "-vcenter-username", conf.VCenterUsername, "-vcenter-password", conf.VCenterPassword, "-vm-inventory-path", conf.VMInventoryPath, "-vcenter-ca-certs", conf.VCenterCACert)
 
 			Eventually(session, shutdownTimeout).Should(Exit(0))
-			Eventually(session.Out, constructOutputTimeout).Should(Say(`mock stemcell automation script executed`))
+			Eventually(session.Out).WithTimeout(constructOutputTimeout).Should(Say(`mock stemcell automation script executed`))
 		})
 
 		It("executes post-reboot automation script", func() {
 			session := helpers.Stembuild(stembuildExecutable, "construct", "-vm-ip", conf.TargetIP, "-vm-username", conf.VMUsername, "-vm-password", conf.VMPassword, "-vcenter-url", conf.VCenterURL, "-vcenter-username", conf.VCenterUsername, "-vcenter-password", conf.VCenterPassword, "-vm-inventory-path", conf.VMInventoryPath, "-vcenter-ca-certs", conf.VCenterCACert)
 
 			Eventually(session, shutdownTimeout).Should(Exit(0))
-			Eventually(session.Out, constructOutputTimeout*5).Should(Say(`mock stemcell automation post-reboot script executed`))
+			Eventually(session.Out).WithTimeout(constructOutputTimeout * 5).Should(Say(`mock stemcell automation post-reboot script executed`))
 		})
 
 		It("extracts the WinRM BOSH powershell script and executes it successfully on the guest VM", func() {
 			session := helpers.Stembuild(stembuildExecutable, "construct", "-vm-ip", conf.TargetIP, "-vm-username", conf.VMUsername, "-vm-password", conf.VMPassword, "-vcenter-url", conf.VCenterURL, "-vcenter-username", conf.VCenterUsername, "-vcenter-password", conf.VCenterPassword, "-vm-inventory-path", conf.VMInventoryPath, "-vcenter-ca-certs", conf.VCenterCACert)
 
 			Eventually(session, shutdownTimeout).Should(Exit(0))
-			Eventually(session.Out, constructOutputTimeout).Should(Say(`Attempting to enable WinRM on the guest vm...WinRm enabled on the guest VM`))
+			Eventually(session.Out).WithTimeout(constructOutputTimeout).Should(Say(`Attempting to enable WinRM on the guest vm...WinRm enabled on the guest VM`))
 		})
 	})
 

stembuild/integration/convert_vmdk_command_test.go

@@ -36,7 +36,7 @@ var _ = Describe("Convert VMDK", func() {
 					inputVmdk = filepath.Join("..", "test", "data", "expected.vmdk")
 
 					session := helpers.Stembuild(stembuildExecutable, "package", "--vmdk", inputVmdk)
-					Eventually(session, 20).Should(Exit(1))
+					Eventually(session).WithTimeout(20).Should(Exit(1))
 					Eventually(session.Err).Should(Say(`versioning error; parsed os version is: 9999`))
 				})
 
@@ -93,7 +93,7 @@ var _ = Describe("Convert VMDK", func() {
 
 func expectStembuildToSucceed(arguments ...string) *Session {
 	session := helpers.Stembuild(stembuildExecutable, arguments...)
-	Eventually(session, 60*time.Second).Should(Exit(0),
+	Eventually(session).WithTimeout(60*time.Second).Should(Exit(0),
 		fmt.Sprintf(
 			"Expected %s %s to exit with code 0, exited with code %d\nout: %s\nerr: %s",
 			stembuildExecutable,

stembuild/integration/package/package_test.go

@@ -88,7 +88,7 @@ var _ = Describe("Package", func() {
 			"-vcenter-ca-certs", pathToCACert,
 		)
 
-		Eventually(session, 60*time.Minute, 5*time.Second).Should(gexec.Exit(0))
+		Eventually(session).WithTimeout(60 * time.Minute).WithPolling(5 * time.Second).Should(gexec.Exit(0))
 		var out []byte
 		session.Out.Write(out) //nolint:errcheck
 		By(fmt.Sprintf("session.Out: '%s'", string(out)))
@@ -143,7 +143,7 @@ var _ = Describe("Package", func() {
 			"-vcenter-ca-certs", pathToCACert,
 		)
 
-		Eventually(session, 60*time.Minute, 5*time.Second).Should(gexec.Exit(0))
+		Eventually(session).WithTimeout(60 * time.Minute).WithPolling(5 * time.Second).Should(gexec.Exit(0))
 		var out []byte
 		session.Out.Write(out) //nolint:errcheck
 		By(fmt.Sprintf("session.Out: '%s'", string(out)))

stembuild/integration/version_test.go

@@ -26,14 +26,14 @@ var _ = Describe("Version flag", func() {
 		It("prints version information", func() {
 			session := helpers.Stembuild(stembuildExecutable, "--version")
 
-			Eventually(session, 20).Should(Exit(0))
+			Eventually(session).WithTimeout(20).Should(Exit(0))
 			Eventually(session).Should(Say(expectedVersion))
 		})
 
 		It("with command, prints version information and does not run command", func() {
 			session := helpers.Stembuild(stembuildExecutable, "--version", "package")
 
-			Eventually(session, 20).Should(Exit(0))
+			Eventually(session).WithTimeout(20).Should(Exit(0))
 			Eventually(session).Should(Say(expectedVersion))
 		})
 	})

stembuild/test/helpers/helpers.go

@@ -182,7 +182,7 @@ func BuildStembuild(version string) (string, error) {
 		NewPrefixedWriter(DebugOutPrefix, GinkgoWriter),
 		NewPrefixedWriter(DebugErrPrefix, GinkgoWriter))
 	Expect(err).NotTo(HaveOccurred())
-	Eventually(session, 240*time.Second).Should(Exit(0))
+	Eventually(session).WithTimeout(240 * time.Second).Should(Exit(0))
 
 	files, err := os.ReadDir(filepath.Join(root, "out"))
 	Expect(err).NotTo(HaveOccurred())