Skip to content

Fix the iptables issues#16491

Merged
ph merged 2 commits intoelastic:6.8from
ph:fix/issue-with-testing
Feb 24, 2020
Merged

Fix the iptables issues#16491
ph merged 2 commits intoelastic:6.8from
ph:fix/issue-with-testing

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Feb 21, 2020

What does this PR do?

The fileset of the iptables test didn't skip the @timestamp field, so
I have included the iptables.log data to the list of dataset to remove.

I also changed the assertion slighly to be relevant on the order of the
expectation and instead of dropping the JSON output in the log we will
display the difference as a diff.

Fix issues with #15980

I will make another PR to master to add the new assertion which gives you more information about what the error is instead of just dropping the whole JSON object.

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

The fileset of the iptables test didn't skip the @timestamp field, so
I have included the iptables.log data to the list of dataset to remove.

I also changed the assertion slighly to be relevant on the order of the
expectation and instead of dropping the JSON output in the log we will
display the difference as a diff.

Fix issues with #15980
@ph ph added review [zube]: In Review Team:Platforms Label for the Integrations - Platforms team labels Feb 21, 2020
@ph ph requested review from urso and removed request for urso February 21, 2020 16:30
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 21, 2020

gonna fix.. pep8..

@ph ph added in progress Pull request is currently in progress. [zube]: In Progress and removed [zube]: In Review review labels Feb 21, 2020
@ph ph self-assigned this Feb 21, 2020
@urso
Copy link
Copy Markdown

urso commented Feb 22, 2020

CI failure seems to be unrelated.

@ph ph merged commit c3db742 into elastic:6.8 Feb 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in progress Pull request is currently in progress. Team:Platforms Label for the Integrations - Platforms team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants