Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beginnings of a TCP_test.c overhaul #921

Merged
merged 1 commit into from
Jun 20, 2018
Merged

Beginnings of a TCP_test.c overhaul #921

merged 1 commit into from
Jun 20, 2018

Conversation

hugbubby
Copy link
Member

@hugbubby hugbubby commented Jun 20, 2018

This will be one of many modifications to the autotests to make their unit tests easier to read and more comprehensive. Obviously this pull request does not conclude the work on this unit test but I like to get a pull request in early to see if my style works for you.


This change is Reviewable

@CLAassistant
Copy link

CLAassistant commented Jun 20, 2018

CLA assistant check
All committers have signed the CLA.

@hugbubby
Copy link
Member Author

Damnit, what's up I thought I already checked that this built correctly

@hugbubby
Copy link
Member Author

hugbubby commented Jun 20, 2018

Ah, forgive me, I was unfamiliar with the testing framework you guys used. Probably something I should've checked out before submitting this PR.

@iphydf
Copy link
Member

iphydf commented Jun 20, 2018

Review status: 0 of 1 LGTMs obtained


auto_tests/TCP_test.c, line 64 at r2 (raw file):

    IP_Port ip_port_loopback;
    ip_port_loopback.ip = get_loopback();
    int ret;

Remove this "int ret", instead put it into the loop. Then add "int ret" below, at encrypt_data.


auto_tests/TCP_test.c, line 65 at r2 (raw file):

    ip_port_loopback.ip = get_loopback();
    int ret;
    for(uint8_t i = 0; i < NUM_PORTS; i++)

Space after "for".


auto_tests/TCP_test.c, line 66 at r2 (raw file):

    int ret;
    for(uint8_t i = 0; i < NUM_PORTS; i++)
    {

Put the brace on the same line as the closing parenthesis.


auto_tests/TCP_test.c, line 68 at r2 (raw file):

    {
        ip_port_loopback.port = net_htons(ports[i]);
        ret = net_connect(sock, ip_port_loopback);	

Remove trailing whitespace.


Comments from Reviewable

@hugbubby
Copy link
Member Author

hugbubby commented Jun 20, 2018

Changes made, thank you iphydf-senpai

@iphydf
Copy link
Member

iphydf commented Jun 20, 2018

Review status: 0 of 1 LGTMs obtained


auto_tests/TCP_test.c, line 52 at r4 (raw file):

START_TEST(test_basic)
{
    //Attempt to create a new TCP_Server instance.

Space after //.


auto_tests/TCP_test.c, line 73 at r4 (raw file):

        //Leave open one connection for the next test.
        if (i + 1 < NUM_PORTS) {

if (i != 0) has the same effect but is simpler.


Comments from Reviewable

@iphydf
Copy link
Member

iphydf commented Jun 20, 2018

:lgtm_strong:


Reviewed 1 of 1 files at r5.
Review status: :shipit: complete! 1 of 1 LGTMs obtained


Comments from Reviewable

@iphydf iphydf changed the title Begginings of a TCP_test.c overhaul Beginnings of a TCP_test.c overhaul Jun 20, 2018
@iphydf
Copy link
Member

iphydf commented Jun 20, 2018

Thanks! Please squash all your commits into a single commit.

Tests all ports instead of just one, also adds some comments/changes
error messages to be more descriptive
@iphydf iphydf merged commit 820e45d into TokTok:master Jun 20, 2018
@iphydf iphydf added this to the v0.2.3 milestone Jun 25, 2018
iphydf added a commit to iphydf/c-toxcore that referenced this pull request Sep 5, 2018
v0.2.3
**Merged PRs:**

- [TokTok#951] Only run astyle if the astyle binary exists.
- [TokTok#950] Remove utils.c and utils.h from toxencryptsave build.
- [TokTok#949] Fixes to the imported sodium sources to compile without warnings.
- [TokTok#948] Add a MAX_HOSTNAME_LENGTH constant.
- [TokTok#947] Remove the format test.
- [TokTok#937] Add new Circle CI configuration.
- [TokTok#935] Add a test for double conference invite.
- [TokTok#933] Add Logger to various net_crypto functions, and add `const` to Logger where possible.
- [TokTok#931] Avoid conditional-uninitialised warning for tcp test.
- [TokTok#930] Disable UDP when proxy is enabled.
- [TokTok#928] Use clang-format for C++ code.
- [TokTok#927] Add assertions to bootstrap tests for correct connection type.
- [TokTok#926] Make NULL options behave the same as default options.
- [TokTok#925] Add tests for what happens when passing an invalid proxy host.
- [TokTok#924] Make the net_crypto connection state an enum.
- [TokTok#922] Clarify/Improve test_some test
- [TokTok#921] Beginnings of a TCP_test.c overhaul
- [TokTok#920] Add test for creating multiple conferences in one tox.
- [TokTok#918] Merge irungentoo/master into toktok
- [TokTok#917] Add random testing program.
- [TokTok#916] Fix linking with address sanitizer.
- [TokTok#915] Remove resource_leak_test.
- [TokTok#914] Make dht_test more stable.
- [TokTok#913] Minor cleanup: return early on error condition.
- [TokTok#906] Sort bazel build file according to buildifier standard.
- [TokTok#905] In DEBUG mode, make toxcore crash on signed integer overflow.
- [TokTok#902] Log only the filename, not the full path in LOGGER.
- [TokTok#899] Fix macOS macro because of GNU Mach
- [TokTok#898] Fix enumeration of Crypto_Connection instances
- [TokTok#897] Fix ipport_isset: port 0 is not a valid port.
- [TokTok#894] Fix logging related crash in bootstrap node
- [TokTok#893] Fix bootstrap crashes, still
- [TokTok#892] Add empty logger to DHT bootstrap daemons.
- [TokTok#887] Fix FreeBSD build on Travis
- [TokTok#884] Fix the often call of event tox_friend_connection_status
- [TokTok#883] Make toxcore compile on BSD
- [TokTok#878] fix DHT_bootstrap key loading
- [TokTok#877] Add minitox to under "Other resources" section in the README
- [TokTok#875] Make bootstrap daemon use toxcore's version
- [TokTok#867] Improve network error reporting on Windows
- [TokTok#841] Only check full rtp offset if RTP_LARGE_FRAME is set
- [TokTok#823] Finish @Diadlo's network Family abstraction.
- [TokTok#822] Move system header includes from network.h to network.c
iphydf added a commit to iphydf/c-toxcore that referenced this pull request Sep 5, 2018
v0.2.3
**Merged PRs:**

- [TokTok#951] Only run astyle if the astyle binary exists.
- [TokTok#950] Remove utils.c and utils.h from toxencryptsave build.
- [TokTok#949] Fixes to the imported sodium sources to compile without warnings.
- [TokTok#948] Add a MAX_HOSTNAME_LENGTH constant.
- [TokTok#947] Remove the format test.
- [TokTok#937] Add new Circle CI configuration.
- [TokTok#935] Add a test for double conference invite.
- [TokTok#933] Add Logger to various net_crypto functions, and add `const` to Logger where possible.
- [TokTok#931] Avoid conditional-uninitialised warning for tcp test.
- [TokTok#930] Disable UDP when proxy is enabled.
- [TokTok#928] Use clang-format for C++ code.
- [TokTok#927] Add assertions to bootstrap tests for correct connection type.
- [TokTok#926] Make NULL options behave the same as default options.
- [TokTok#925] Add tests for what happens when passing an invalid proxy host.
- [TokTok#924] Make the net_crypto connection state an enum.
- [TokTok#922] Clarify/Improve test_some test
- [TokTok#921] Beginnings of a TCP_test.c overhaul
- [TokTok#920] Add test for creating multiple conferences in one tox.
- [TokTok#918] Merge irungentoo/master into toktok
- [TokTok#917] Add random testing program.
- [TokTok#916] Fix linking with address sanitizer.
- [TokTok#915] Remove resource_leak_test.
- [TokTok#914] Make dht_test more stable.
- [TokTok#913] Minor cleanup: return early on error condition.
- [TokTok#906] Sort bazel build file according to buildifier standard.
- [TokTok#905] In DEBUG mode, make toxcore crash on signed integer overflow.
- [TokTok#902] Log only the filename, not the full path in LOGGER.
- [TokTok#899] Fix macOS macro because of GNU Mach
- [TokTok#898] Fix enumeration of Crypto_Connection instances
- [TokTok#897] Fix ipport_isset: port 0 is not a valid port.
- [TokTok#894] Fix logging related crash in bootstrap node
- [TokTok#893] Fix bootstrap crashes, still
- [TokTok#892] Add empty logger to DHT bootstrap daemons.
- [TokTok#887] Fix FreeBSD build on Travis
- [TokTok#884] Fix the often call of event tox_friend_connection_status
- [TokTok#883] Make toxcore compile on BSD
- [TokTok#878] fix DHT_bootstrap key loading
- [TokTok#877] Add minitox to under "Other resources" section in the README
- [TokTok#875] Make bootstrap daemon use toxcore's version
- [TokTok#867] Improve network error reporting on Windows
- [TokTok#841] Only check full rtp offset if RTP_LARGE_FRAME is set
- [TokTok#823] Finish @Diadlo's network Family abstraction.
- [TokTok#822] Move system header includes from network.h to network.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants