From 601ed0a3aeef69f2521e6690ea91e33f972405c2 Mon Sep 17 00:00:00 2001 From: Milan Klanjsek Date: Wed, 3 Jan 2018 15:03:05 -0700 Subject: [PATCH] Run all the tests, do some cleanup, extend timeouts [#153997365] Signed-off-by: Jesse Alford --- tests/acceptance_test.go | 10 +++++++++- tests/tests_suite_test.go | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/acceptance_test.go b/tests/acceptance_test.go index 890916bf..a3bd196e 100644 --- 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 index f7375672..f0d2c968 100644 --- 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)