Skip some tests on non-MPTCP kernels, part 2. #216
Merged
Conversation
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
The mptcpd unit tests test-commands, test-path-manager and test-mptcpwrap require a MPTCP capable kernel to run. Make those tests return with an exit status (77) that causes the Automake test driver script, i.e. `test-driver' to treat the tests as skipped. This allows the test suite to succeed when MPTCP is not available in the kernel. The test summary from a `make check' run would look similar to the following when run on a non-MPTCP capable kernel: ... PASS: test-network-monitor SKIP: test-path-manager SKIP: test-commands PASS: test-configuration ... SKIP: test-mptcpwrap ========================================================================= Testsuite summary for mptcpd 0.9 ========================================================================= # TOTAL: 17 # PASS: 14 # SKIP: 3 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ========================================================================= Fixes multipath-tcp#204.
Without 'sudo', mptcpd was started but the exit status was not checked. So probably best to skip the test than marking it as PASS but not checking anything. Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Without MPTCP, the sysctl commands fail and mptcpd always returns an error because the kernel doesn't support MPTCP. In other words, the test fails without MPTCP support, best to skip it. Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Pull Request Test Coverage Report for Build 1789178453Warning: 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 |
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.
I had to add two commits on top of #215.
I'm adding them in this new PR as I cannot edit @ossama-othman 's one, I hope that's OK :)
In short, start-stop was not working with a non-MPTCP kernel and a 'Non-interactive sudo capable'.
While at it, I also skip the test instead of doing nothing is we don't have a 'Non-interactive sudo capable'.
Now all tests are OK on my test VM: