Consolidate "bad pcap" tests #2988
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When #2987 got merged, a "bad pcap" test that we'd stopped running in CI became reactivated, but the way pcap errors are surfaced changed in #2955 such that the test fails now on tip of
main. As it turns out, the way the error is reported now looks much the same as in the new test added as part of #2955. Therefore it seems the tests can be consolidated, which I'm proposing doing in this PR.There's a little more devil in the details, too. For the new "bad pcap" test added as part of #2955, as I get into in brimdata/brimcap#331 (comment), the way the error is being reported as Zeek's fault is actually inaccurate and so I expect it to start loading successfully in Zui once that Brimcap issue is addressed (i.e., we could maybe justify keeping both tests around, but the new one has a limited life span). Meanwhile, the old "bad pcap" test I'm proposing keeping around doesn't even load in Wireshark so it's irreparably "bad" and so what's being surfaced as a Zeek error is 100% accurate, hence my preference to keep that one.
I did, however, keep the idea from the deleted test of specifying the increased timeouts as a multiple of 60 seconds. 😄
This Actions run shows how it was failing before these changes, and this Actions run shows it working again with the branch for this PR.