Skip to content
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.

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

Fix SampleScriptTest #13204

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Fix SampleScriptTest #13204

merged 1 commit into from
Jun 22, 2024

Conversation

danielb987
Copy link
Contributor

@icklesteve
@bobjacobsen
This seems to fix the SampleScriptTest and TurnoutStatePersistence.py. At least the summary works now. The problem was that SampleScriptTest called ShutdownManager.shutdown() which in turn called System.exit(status).

One additional note:
DefaultShutDownManager.doShutdown(int status, boolean exit) has a Javadoc that's wrong. It says that it returns false if user aborts, but the method is void so it doesn't return any value. I haven't changed this since I'm not exactly sure how the Javadoc should be instead.

Also, there is several @SuppressFBWarnings() about DM_EXIT. The one for doShutdown() is probably needed but the others can probably be removed.

@danielb987 danielb987 added Bug New PR Newly created PR that is less than 1 day old labels Jun 21, 2024
@danielb987 danielb987 added this to the 5.9.1 milestone Jun 21, 2024
@danielb987 danielb987 self-assigned this Jun 21, 2024
Copy link

mergeable bot commented Jun 21, 2024

Thanks for the PR. Please consider adding a release note in the help/en/releasenotes/current-draft-note.shtml file.

Copy link
Member

@bobjacobsen bobjacobsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for figuring this out and fixing it!

@danielb987 danielb987 removed the New PR Newly created PR that is less than 1 day old label Jun 22, 2024
@danielb987 danielb987 merged commit 12a2ec0 into JMRI:master Jun 22, 2024
14 checks passed
@danielb987 danielb987 deleted the JythonTest branch June 22, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants