Split protocol testing into separate ITs for zilla dump command#989
Merged
Conversation
attilakreiner
force-pushed
the
dump-test
branch
5 times, most recently
from
ab250ab to
79d1ecb
Compare
attilakreiner
changed the title
jfallows
requested changes
May 8, 2024
jfallows
reviewed
May 13, 2024
jfallows
left a comment
jfallows
left a comment
Contributor
There was a problem hiding this comment.
Looks like we are getting closer, just the remaining extension types to verify correct via tshark and zilla.lua dissector.
jfallows
approved these changes
May 22, 2024
Comment on lines
+170
to
+171
| <exclude>**/keys</exclude> | ||
| <exclude>**/trust</exclude> |
Contributor
There was a problem hiding this comment.
Suggested change
| <exclude>**/keys</exclude> | |
| <exclude>**/trust</exclude> | |
| <exclude>src/test/democa/**/*</exclude> |
| int offset, | ||
| int length) | ||
| { | ||
| boolean shouldWrite = channel.getConfig().hasWriteClosed() || !channel.engine.serverClosed().get(); |
Contributor
There was a problem hiding this comment.
The second part of this condition is effectively using a global variable on the engine as a whole which doesn't seem quite right.
What problem were we trying to solve with that? What breaks when it is removed?
Comment on lines
+68
to
+70
| void setWriteClosed(boolean timestamps); | ||
|
|
||
| boolean hasWriteClosed(); |
Contributor
There was a problem hiding this comment.
Suggested change
| void setWriteClosed(boolean timestamps); | |
| boolean hasWriteClosed(); | |
| void setCloseable(boolean closeable); | |
| boolean isCloseable(); |
| public static final TypeInfo<Long> OPTION_AFFINITY = new TypeInfo<>("affinity", Long.class); | ||
| public static final TypeInfo<Byte> OPTION_CAPABILITIES = new TypeInfo<>("capabilities", Byte.class); | ||
| public static final TypeInfo<String> OPTION_TIMESTAMPS = new TypeInfo<>("timestamps", String.class); | ||
| public static final TypeInfo<String> OPTION_WRITE_CLOSED = new TypeInfo<>("writeClosed", String.class); |
Contributor
There was a problem hiding this comment.
Suggested change
| public static final TypeInfo<String> OPTION_WRITE_CLOSED = new TypeInfo<>("writeClosed", String.class); | |
| public static final TypeInfo<String> OPTION_CLOSEABLE = new TypeInfo<>("closeable", String.class); |
| acceptOptions.add(OPTION_ALIGNMENT); | ||
| acceptOptions.add(OPTION_CAPABILITIES); | ||
| acceptOptions.add(OPTION_TIMESTAMPS); | ||
| acceptOptions.add(OPTION_WRITE_CLOSED); |
Contributor
There was a problem hiding this comment.
Suggested change
| acceptOptions.add(OPTION_WRITE_CLOSED); | |
| acceptOptions.add(OPTION_CLOSEABLE); |
| connectOptions.add(OPTION_AFFINITY); | ||
| connectOptions.add(OPTION_CAPABILITIES); | ||
| connectOptions.add(OPTION_TIMESTAMPS); | ||
| connectOptions.add(OPTION_WRITE_CLOSED); |
Contributor
There was a problem hiding this comment.
Suggested change
| connectOptions.add(OPTION_WRITE_CLOSED); | |
| connectOptions.add(OPTION_CLOSEABLE); |
Comment on lines
+211
to
+223
| @Override | ||
| public void setWriteClosed( | ||
| boolean writeClosed) | ||
| { | ||
| this.writeClosed = writeClosed; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasWriteClosed() | ||
| { | ||
| return writeClosed; | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| @Override | |
| public void setWriteClosed( | |
| boolean writeClosed) | |
| { | |
| this.writeClosed = writeClosed; | |
| } | |
| @Override | |
| public boolean hasWriteClosed() | |
| { | |
| return writeClosed; | |
| } | |
| @Override | |
| public void setCloseable( | |
| boolean closeable) | |
| { | |
| this.closeable = closeable; | |
| } | |
| @Override | |
| public boolean isCloseable() | |
| { | |
| return closeable; | |
| } | |
Comment on lines
+281
to
+284
| else if (OPTION_WRITE_CLOSED.getName().equals(key)) | ||
| { | ||
| setWriteClosed(Boolean.parseBoolean(Objects.toString(value, "false"))); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| else if (OPTION_WRITE_CLOSED.getName().equals(key)) | |
| { | |
| setWriteClosed(Boolean.parseBoolean(Objects.toString(value, "false"))); | |
| } | |
| else if (OPTION_CLOSEABLE.getName().equals(key)) | |
| { | |
| setCloseable(Boolean.parseBoolean(Objects.toString(value, "false"))); | |
| } |
| super(); | ||
| setBufferFactory(NATIVE_BUFFER_FACTORY); | ||
| setTimestamps(true); | ||
| setWriteClosed(true); |
Contributor
There was a problem hiding this comment.
Suggested change
| setWriteClosed(true); | |
| setClosable(true); |
| private long affinity; | ||
| private byte capabilities; | ||
| private boolean timestamps; | ||
| private boolean writeClosed; |
Contributor
There was a problem hiding this comment.
Suggested change
| private boolean writeClosed; | |
| private boolean closeable; |
This file contains hidden or 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
2 participants
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.
Description
This change splits the zilla dump command testing into separate ITs per protocol, with k3po scripts used to drive the engine and produce the engine frames used to generate the packet capture, then a text-based comparison is used to make diffs more readable should an IT fail.
Fixes #958