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

Bring back prospector.type which went missing #4361

Merged
merged 1 commit into from May 22, 2017

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented May 19, 2017

It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.

@ruflin
Copy link
Member Author

ruflin commented May 19, 2017

@vjsamuel As you are working off master, this could interest you.

@vjsamuel
Copy link
Contributor

@ruflin, i did notice that prospector.type was missing. i thought that i was not looking at it properly :)

filebeat.check_kill_and_wait()

output = self.read_output()[0]
assert "@timestamp" in output
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't we assert that prospector.type is in the output ?

Copy link
Member Author

Choose a reason for hiding this comment

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

YES. I'm not really confused to not see it here, because that is the reason I added this test. Not sure what I was doing. Thanks for spotting this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.
@ruflin ruflin force-pushed the bring-back-prospector-type branch from 32349bc to 47cf36f Compare May 22, 2017 07:23
Test if the basic fields exist.
"""
self.render_config_template(
path=os.path.abspath(self.working_dir) + "/test.log",
Copy link
Member

Choose a reason for hiding this comment

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

After dealing with weird path issues lately, I recommend using os.path.join over string concat to join paths. Or even just putting the + "/test.log" inside the abspath() call would fix the problem because abspath normalizes the path that it returns.

@andrewkroh andrewkroh merged commit b1e44a5 into elastic:master May 22, 2017
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

4 participants