Merge branch 'main' into fix-linter

cloudfoundry · May 22, 2024 · d449fa8 · d449fa8
2 parents be398e6 + 01a610c
commit d449fa8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -204,15 +204,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
@@ -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