Skip to content

FEATURE_IPV4/TESTS: result status could be wrong #2744

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 22, 2016
Merged

FEATURE_IPV4/TESTS: result status could be wrong #2744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11d0f51
FEATURE_IPV4/TESTS: result status could be wrong
jeromecoutant Sep 19, 2016
b7caa54
tcp_client_hello_worldminor update
jeromecoutant Sep 20, 2016
257c367
tcp_client_hello_world K&R style
jeromecoutant Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions features/net/FEATURE_IPV4/TESTS/mbedmicro-net/tcp_client_hello_world/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ bool find_substring(const char *first, const char *last, const char *s_first, co
int main() {
GREENTEA_SETUP(20, "default_auto");

bool result = true;
bool result = false;
EthernetInterface eth;
//eth.init(); //Use DHCP
eth.connect();
printf("TCP client IP Address is %s\r\n", eth.get_ip_address());

TCPSocket sock(&eth);
printf("HTTP: Connection to %s:%d\r\n", HTTP_SERVER_NAME, HTTP_SERVER_PORT);
if (sock.connect(HTTP_SERVER_NAME, HTTP_SERVER_PORT) == 0) {
printf("HTTP: Connected to %s:%d\r\n", HTTP_SERVER_NAME, HTTP_SERVER_PORT);
printf("HTTP: OK\r\n");

// We are constructing GET command like this:
// GET http://developer.mbed.org/media/uploads/mbed_official/hello.txt HTTP/1.0\n\n
Expand All @@ -66,17 +67,21 @@ int main() {
TEST_ASSERT_TRUE(found_200_ok);
TEST_ASSERT_TRUE(found_hello);

result = true;
if (!found_200_ok) result = false;
if (!found_hello) result = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you change the above three lines to:

if (found_200_ok && found_hello) result = true;


printf("HTTP: Received %d chars from server\r\n", ret);
printf("HTTP: Received 200 OK status ... %s\r\n", found_200_ok ? "[OK]" : "[FAIL]");
printf("HTTP: Received '%s' status ... %s\r\n", HTTP_HELLO_STR, found_hello ? "[OK]" : "[FAIL]");
printf("HTTP: Received massage:\r\n\r\n");
printf("HTTP: Received message:\r\n");
printf("%s", buffer);
sock.close();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could fix the indent here?

}
else {
Copy link
Contributor

@bridadan bridadan Sep 20, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last little nit pick: could you put the above two lines on the same line? According to our committer guide, we follow the K&R style: https://github.com/ARMmbed/mbed-os/blob/master/docs/COMMITTERS.md#rules

So:

}
else {

becomes:

} else {

printf("HTTP: ERROR\r\n");
}

sock.close();
eth.disconnect();
GREENTEA_TESTSUITE_RESULT(result);
}
4 changes: 3 additions & 1 deletion features/net/FEATURE_IPV4/TESTS/mbedmicro-net/udp_echo_client/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int main() {

greentea_send_kv("target_ip", eth.get_ip_address());

bool result = true;
bool result = false;

char recv_key[] = "host_port";
char ipbuf[60] = {0};
Expand Down Expand Up @@ -66,6 +66,8 @@ int main() {
result = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're assuming false by default, can we remove this line?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so.
Result is set to true at each loop, so before break, we need to set it back to false

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeromecoutant Oops, not sure how I missed that, thanks for pointing that out. You're right, this line should stay in then.

break;
}

result = true;
}

sock.close();
Expand Down