Reduce default timeout in tests, but allow much longer for deploy/delete

- Also, reduce default polling interval to reduce noise in output. Signed-off-by: Jesse Alford <jalford@pivotal.io>
cloudfoundry · Jan 3, 2018 · 7fa105b · 7fa105b
1 parent c8b4755
commit 7fa105b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tests/acceptance_test.go b/tests/acceptance_test.go
@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/jtarchie/syslog/pkg/log"
 	. "github.com/onsi/ginkgo"
@@ -41,7 +42,7 @@ var _ = Describe("Forwarding loglines to a TCP syslog drain", func() {
 
 	Deploy := func(manifest string) *gexec.Session {
 		session := BoshCmd("deploy", manifest, "-v", fmt.Sprintf("deployment=%s", DeploymentName()))
-		Eventually(session).Should(gexec.Exit(0))
+		Eventually(session, 10*time.Minute).Should(gexec.Exit(0))
 		return session
 	}
 
@@ -67,7 +68,7 @@ var _ = Describe("Forwarding loglines to a TCP syslog drain", func() {
 
 	Cleanup := func() {
 		session := BoshCmd("delete-deployment")
-		Eventually(session).Should(gexec.Exit(0))
+		Eventually(session, 10*time.Minute).Should(gexec.Exit(0))
 	}
 
 	TestSharedBehavior := func() {

diff --git a/tests/tests_suite_test.go b/tests/tests_suite_test.go
@@ -15,8 +15,8 @@ func TestTests(t *testing.T) {
 }
 
 var _ = BeforeEach(func() {
-	SetDefaultEventuallyTimeout(5 * time.Minute)
-	SetDefaultEventuallyPollingInterval(time.Second)
+	SetDefaultEventuallyTimeout(3 * time.Minute)
+	SetDefaultEventuallyPollingInterval(5 * time.Second)
 	SetDefaultConsistentlyDuration(time.Minute)
 	SetDefaultConsistentlyPollingInterval(time.Second)
 })