Skip to content

fix: stop router before NATS in integration test cleanup #557

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

Closed
rkoster wants to merge 1 commit into from
Closed

fix: stop router before NATS in integration test cleanup #557

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
10 changes: 6 additions & 4 deletions src/code.cloudfoundry.org/gorouter/integration/common_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,12 @@ func (s *testState) StartGorouterOrFail() {
}

func (s *testState) StopAndCleanup() {
// Stop router before NATS to prevent subscriber's ClosedCB from
// firing log.Fatal → os.Exit(1), which kills the test proc
if s.gorouterSession != nil && s.gorouterSession.ExitCode() == -1 {
Eventually(s.gorouterSession.Terminate(), 5).Should(Exit(0))
}

if s.natsRunner != nil {
s.natsRunner.Stop()
}
Expand All @@ -308,10 +314,6 @@ func (s *testState) StopAndCleanup() {

os.RemoveAll(s.tmpdir)

if s.gorouterSession != nil && s.gorouterSession.ExitCode() == -1 {
Eventually(s.gorouterSession.Terminate(), 5).Should(Exit(0))
}

if s.fakeMetron != nil {
s.StopMetron()
}
Expand Down
Loading