Run all the tests, do some cleanup, extend timeouts [#153997365]

Signed-off-by: Jesse Alford <jalford@pivotal.io>
cloudfoundry · Jan 3, 2018 · 601ed0a · 601ed0a
1 parent 1ecfd21
commit 601ed0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tests/acceptance_test.go b/tests/acceptance_test.go
@@ -127,6 +127,10 @@ var _ = Describe("Forwarding loglines to a TCP syslog drain", func() {
 			Cleanup()
 			Deploy("manifest.yml")
 		})
+		AfterEach(func() {
+			Cleanup()
+		})
+
 		TestSharedBehavior()
 	})
 
@@ -135,7 +139,11 @@ var _ = Describe("Forwarding loglines to a TCP syslog drain", func() {
 			Cleanup()
 			Deploy("manifests/tcp-blackbox.yml")
 		})
-		// TestSharedBehavior()
+		AfterEach(func() {
+			Cleanup()
+		})
+
+		TestSharedBehavior()
 		It("fowards messages of over 1KB", func() {
 			message := counterString(1025, "A")
 

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