tests: Expand mptcpd start/stop test. #194
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
Test mptcpd start and stop when MPTCP is both disabled and enabled.
Pull Request Test Coverage Report for Build 1625372049Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
Only run the individual enabled/disabled MPTCP test cases if the "enabled" value can be set non-interactively.
mjmartineau
reviewed
Jan 5, 2022
| # 2, depending on the kernel in use. For example, the | ||
| # multipath-tcp.org kernel "enabled" value could be 1 or 2. Use the | ||
| # old "enabled" value in case it is 2 instead of 1. | ||
| if [ $old_value -ne 0 ] |
There was a problem hiding this comment.
My system complains here:
tests/test-start-stop: line 23: [: too many arguments
There was a problem hiding this comment.
Fixed by commit ef905e7.
The regex didn't correctly handle multiple net.mptcp sysctl variables with enabled in them. In particular, the 5.13 kernel on my Ubuntu box only has net.mptcp.enabled whereas the 5.15 kernel, for example, also has a net.mptcp.checksum_enabled variable, resulting in multiple values being assigned to the $old_value shell variable.
The regular expression used to detect the MPTCP "enabled" sysctl variable did not support the case where multiple net.mptcp sysctl variables contain "enabled" in them. For example recent upstream kernels have net.mptcp.checksum_enabled and net.mptcp.enable sysctl variable. Both values would end up being placed in the to shell variable used to store the old variable resulting in a syntax error when performing an integer comparison, e.g. [ 0 1 -ne 0 ]. Simplify the regular expressions and leverage built-in pattern matching in the sysctl command.
|
Expected content of Interactive
|
mjmartineau
approved these changes
Jan 6, 2022
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.
Test mptcpd start and stop when MPTCP is both disabled and enabled.