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

Search: add support for terminate_after option #1168

Merged
merged 5 commits into from
Sep 5, 2016
Merged

Conversation

gibrown
Copy link
Contributor

@gibrown gibrown commented Aug 30, 2016

  • Also adds simple test for the option
  • Breaks out invalid option test into a separate test so that if the other options become invalid their exceptions will be detected. As previously written the exception is ignored everywhere in the test.

Fixes #1137

- also adds simple test for the option
- breaks out invalid option test into a separate test so that if the other options become invalid their exceptions will be detected
@ruflin
Copy link
Owner

ruflin commented Aug 31, 2016

Thanks for the addition. LGTM. Could you please also update the CHANGELOG.md?

@gibrown
Copy link
Contributor Author

gibrown commented Aug 31, 2016

Changelog updated

@ruflin
Copy link
Owner

ruflin commented Sep 1, 2016

@gibrown Thx. It seems your branch has a conflict with master. Probably there is a conflict in the Changelog. Could you rebase on top of master and resolve the conflict?

- also adds simple test for the option
- breaks out invalid option test into a separate test so that if the other options become invalid their exceptions will be detected
@gibrown
Copy link
Contributor Author

gibrown commented Sep 3, 2016

Sorry about that. I think it should be all set.

@ruflin ruflin merged commit ccbd3df into ruflin:master Sep 5, 2016
@ruflin
Copy link
Owner

ruflin commented Sep 5, 2016

@gibrown Merged. Thanks a lot for the contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants