Fix cli_tests websocket port binding issue #1178 #1187
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
abitmore
changed the title
This was referenced Jul 26, 2018
Closed
pmconrad
suggested changes
Jul 27, 2018
.travis.yml
Outdated
| @@ -22,6 +22,7 @@ script: | |||
| - sed -i '/tests/d' libraries/fc/CMakeLists.txt | |||
| - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON . | |||
| - 'which build-wrapper-linux-x86-64 && build-wrapper-linux-x86-64 --out-dir bw-output make -j 2 cli_wallet witness_node chain_test cli_test || make -j 2 cli_wallet witness_node chain_test cli_test' | |||
| - sudo sysctl -w net.ipv4.ip_local_port_range="32768 60999" | |||
There was a problem hiding this comment.
Please remove that line, it's not necessary.
tests/cli/main.cpp
Outdated
| @@ -71,7 +71,7 @@ int get_available_port() | |||
| socklen_t len = sizeof(sin); | |||
| if (getsockname(socket_fd, (struct sockaddr *)&sin, &len) == -1) | |||
| return -1; | |||
| return sin.sin_port; | |||
| return ntohs(sin.sin_port); | |||
There was a problem hiding this comment.
While you're at it, please close socket_fd before returning.
sin_port is the the assigned port number, in network byte order.
abitmore
force-pushed
the
abitmore-patch-3
branch
from
63e6d8d to
716d519
Compare
|
Rebased. |
abitmore
force-pushed
the
abitmore-patch-3
branch
from
716d519 to
5c615ae
Compare
pmconrad
approved these changes
Jul 28, 2018
|
socket_fd remains open if either bind() or getsockname() fails, but I think in a unit test that's acceptable. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
PR for #1178.
Reference: