Re: [PATCH mptcp-next v4 4/4] selftests: mptcp: add mptcp_lib_events helper

[Matthieu Baerts <matttbe@kernel.org>]

On 22/02/2024 12:07 pm, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 22/02/2024 4:40 am, Geliang Tang wrote:
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> To avoid duplicated code in different MPTCP selftests, we can add and
>> use helpers defined in mptcp_lib.sh.
>>
>> This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh
>> and mptcp_join.sh into a helper mptcp_lib_events(). Define it in
>> mptcp_lib.sh and use it in both scripts.
> 
> (...)
> 
>> diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
>> index f65a31594829..5b5ad9947c21 100644
>> --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
>> +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
>> @@ -399,3 +399,17 @@ mptcp_lib_ns_exit() {
>>  		rm -f /tmp/"$netns".{nstat,out}
>>  	done
>>  }
>> +
>> +mptcp_lib_events() {
>> +	local ns="${1}"
>> +	local evts="${2}"
>> +	declare -n pid="${3}"
>> +
>> +	:>"${evts}"
>> +
>> +	if [ ${pid} -ne 0 ]; then
> 
> Yet another new shellcheck warning introduced here:
> 
>>
>> In mptcp_lib.sh line 410:
>>         if [ ${pid} -ne 0 ]; then
>>              ^----^ SC2086 (info): Double quote to prevent globbing and word splitting.
>>
>> Did you mean: 
>>         if [ "${pid}" -ne 0 ]; then
> 
> I guess the CI should check that and report it, so I would not have to
> fix that just before applying patches.

In fact, we don't need this check because mptcp_lib_kill_wait() does
nothing if the pid is set to 0. So I simplified the fix by removing the
condition.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.