Skip to content

Conversation

@xiaoxiang781216
Copy link
Contributor

No description provided.

… false

since usrsock_conn_s::resp::result contain more detailed info and fix the below error in usrsocktest:
Testing group "WakeWithSignal" =>
	[TEST ASSERT FAILED!]
		In function "do_usrsock_blocking_connect_thread":
		line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed.
			got value: 110
			should be: 113
	[TEST ASSERT FAILED!]
		In function "do_usrsock_blocking_connect_thread":
		line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed.
			got value: 110
			should be: 113
	[TEST ASSERT FAILED!]
		In function "do_usrsock_blocking_connect_thread":
		line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed.
			got value: 110
			should be: 113
	[TEST ASSERT FAILED!]
		In function "do_wake_test":
		line 567: Assertion `(bool)((usrsocktest_test_failed)) == (bool)(false)' failed.
			got value: 1
			should be: 0
	Group "WakeWithSignal": [FAILED]

Change-Id: I0cbd9d659e3ecf8be457bec94df2f33f647314a1
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Fix the below error in usrsocktest:
Testing group "WakeWithSignal" =>
	[TEST ASSERT FAILED!]
		In function "do_usrsock_blocking_socket_thread":
		line 122: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((115))' failed.
			got value: 123
			should be: 115
	[TEST ASSERT FAILED!]
		In function "do_wake_test":
		line 567: Assertion `(bool)((usrsocktest_test_failed)) == (bool)(false)' failed.
			got value: 1
			should be: 0
	Group "WakeWithSignal": [FAILED]

Change-Id: Ib80a078c2418a434343e1c2674d6826a9a089ce7
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
@xiaoxiang781216
Copy link
Contributor Author

Fix the issue mention in:
#24

@patacongo patacongo changed the base branch from master to pr354 February 22, 2020 13:29
@patacongo patacongo merged commit f1c0311 into apache:pr354 Feb 22, 2020
@xiaoxiang781216 xiaoxiang781216 deleted the fix-usrsocktest branch February 22, 2020 14:17
*/

ret = g_usrsock_sockif.si_setup(psock, protocol);
if (ret == -ENETDOWN)
Copy link
Contributor

Choose a reason for hiding this comment

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

But does this break the dual usrsock / nuttx tcp-stack use-case? Device where connectivity can be configured to use usrsock or nuttx tcp-stack?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean runtime switch between usrsock and real tcp/ip stack instead of compile decision?

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, when usrsock daemon not running, try nuttx tcp-stack instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If so, we need revert this patch, but adjust usrsocktest too. Actually, I think many testcase in usrsocktest is too strict to verfiy the errno must equal some specific value. A little internal modification like this will break the testcase.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree, usrsocktest errno checking should be more relaxed and allow different error values. Specific error values should only be checked when they are really expected.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants