From 01a610cc72a42ead08d6eb536c2295c1d1f25924 Mon Sep 17 00:00:00 2001 From: Al Berez Date: Wed, 22 May 2024 13:42:48 -0700 Subject: [PATCH] Retry flaky ssh test on mac worker (#2941) - Simplified CLI SSH Suit execution to run togetheer with other non-plugin tests https://onsi.github.io/ginkgo/#repeating-spec-runs-and-managing-flaky-specs --- Makefile | 6 ++---- util/clissh/ssh_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a01575de516..7306e566aae 100644 --- a/Makefile +++ b/Makefile @@ -206,15 +206,13 @@ units-non-plugin: install-test-deps @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skip-package integration,cf\ssh,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh + -skip-package integration,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword else units-non-plugin: install-test-deps @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skip-package integration,cf/ssh,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh + -skip-package integration,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword endif units-full: build units-plugin units-non-plugin diff --git a/util/clissh/ssh_test.go b/util/clissh/ssh_test.go index 18d07e0577d..2451e2a39d0 100644 --- a/util/clissh/ssh_test.go +++ b/util/clissh/ssh_test.go @@ -50,7 +50,7 @@ func BlockAcceptOnClose(fake *fake_net.FakeListener) { } } -var _ = Describe("CLI SSH", Serial, func() { +var _ = Describe("CLI SSH", Serial, FlakeAttempts(9), func() { var ( fakeSecureDialer *clisshfakes.FakeSecureDialer fakeSecureClient *clisshfakes.FakeSecureClient