Skip to content

Fix Windows test deadlock by removing aggressive defer cleanup #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ameowlia merged 1 commit into from
May 27, 2026
Merged

Fix Windows test deadlock by removing aggressive defer cleanup #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions src/code.cloudfoundry.org/inigo/cell/assets/fake_app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,6 @@ var _ = Describe("Fake App Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for server to start
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down Expand Up @@ -125,17 +114,6 @@ var _ = Describe("Fake App Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for server to start
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down Expand Up @@ -165,17 +143,6 @@ var _ = Describe("Fake App Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for app to start listening
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down
44 changes: 0 additions & 44 deletions src/code.cloudfoundry.org/inigo/cell/assets/fake_proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@ var _ = Describe("Fake Proxy Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for proxy to start listening on port 61001
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down Expand Up @@ -79,17 +68,6 @@ var _ = Describe("Fake Proxy Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for proxy to start listening on port 61001
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down Expand Up @@ -136,17 +114,6 @@ var _ = Describe("Fake Proxy Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for proxy to start
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down Expand Up @@ -192,17 +159,6 @@ var _ = Describe("Fake Proxy Exit Behavior", Serial, func() {
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())

// Ensure cleanup on test completion
defer func() {
if session.ExitCode() == -1 { // Process still running
session.Kill()
}
// On Windows, add extra cleanup time
if runtime.GOOS == "windows" {
time.Sleep(100 * time.Millisecond)
}
}()

// Wait for proxy to start listening
Eventually(func() error {
client := &http.Client{Timeout: 1 * time.Second}
Expand Down
Loading