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 TLSConfigTests.test_runner_and_scheduler failing #6308

Merged

Conversation

Smjert
Copy link
Member

@Smjert Smjert commented Mar 17, 2020

Do not close the http server after 10s if there are requests coming,
since some tests may take more than 10s to run.
Reset the timer each time a request is received by the server instead.

theopolis
theopolis previously approved these changes Mar 18, 2020
Copy link
Member

@theopolis theopolis left a comment

Choose a reason for hiding this comment

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

Awesome!

Do not close the http server after 10s if there are requests coming,
since some tests may take more than 10s to run.
Reset the timer each time a request is received by the server instead.
@Smjert
Copy link
Member Author

Smjert commented Mar 23, 2020

Rebased on latest master, to get the fix for the disk exhaustion on the CI.

@theopolis theopolis merged commit 29697f6 into osquery:master Mar 27, 2020
@Smjert Smjert deleted the stefano/test/http-server-timeout branch April 2, 2020 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants