Re: [PATCH mptcp-next v2 0/7] add helpers and vars in mptcp_lib.sh, part 4

[Geliang Tang <geliang@kernel.org>]

Hi Matt,

On Fri, Mar 08, 2024 at 01:11:43PM +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 08/03/2024 11:35, Matthieu Baerts wrote:
> > Hi Geliang,
> > 
> > On 08/03/2024 06:57, Geliang Tang wrote:
> >> From: Geliang Tang <tanggeliang@kylinos.cn>
> >>
> >> v2:
> >>  - add new patches #1 & #3
> >>  - #2 drop the tab in
> >> "\tExpected value for '${var}': '${!exp}', got '${!var}'.", this breaks
> >> the alignments.
> >>  - drop 'rc' in patch #2 & #4
> >>  - use declare in #5
> >>  - drop 
> >> extra_srv_args+=" $extra_args"
> >> extra_cl_args+=" $extra_args"
> >>    in #7
> > 
> > Thank you for the new version!
> > 
> > Did you check that after your modifications errors are still caught as
> > before, and presented correctly? (the CI didn't get any error)
> 

Yes, I checked the error logs, they are fine as before.

Old userspace_pm log:

34 MP_PRIO TX                                                          [ OK ]
35 MP_PRIO RX                                                          [ OK ]
INFO: Listener tests
36 CREATE_LISTENER 0:57916                                             [FAIL]
	Expected value for 'family': '0', got '2'.
	Expected value for 'saddr': '0', got '10.0.2.2'.
37 CLOSE_LISTENER 0:57916                                              [FAIL]
	Expected value for 'family': '0', got '2'.
	Expected value for 'saddr': '0', got '10.0.2.2'.
... ...
not ok 36 - userspace_pm: CREATE_LISTENER 0:57916
not ok 37 - userspace_pm: CLOSE_LISTENER 0:57916

New userspace_pm log:

34 MP_PRIO TX                                                          [ OK ]
35 MP_PRIO RX                                                          [ OK ]
INFO: Listener tests
36 CREATE_LISTENER 10.0.2.2:57310                                      [FAIL]
Expected value for 'family': '0', got '2'.
Expected value for 'saddr': '0', got '10.0.2.2'.
37 CLOSE_LISTENER 10.0.2.2:57310                                       [FAIL]
Expected value for 'family': '0', got '2'.
Expected value for 'saddr': '0', got '10.0.2.2'.
... ...
not ok 36 - userspace_pm: CREATE_LISTENER 10.0.2.2:57310
not ok 37 - userspace_pm: CLOSE_LISTENER 10.0.2.2:57310

Old mptcp_join.sh log:

      rm                                  [ OK ]
      rmsf                                [ OK ]
      Info: invert
      LISTENER_CREATED 0:10100            [FAIL] 15:15 0:2 0:10.0.2.1 10100:10100
Server ns stats
MPTcpExtPortAdd                 1                  0.0
MPTcpExtMPJoinPortSynAckRx      1                  0.0
MPTcpExtRmAddr                  1                  0.0
... ...
      LISTENER_CLOSED  0:10100            [FAIL] 16:16 0:2 0:10.0.2.1 10100:10100
... ...
not ok 3 - mptcp_join: remove single address with port


New mptcp_join.sh log:

      rmsf                                [ OK ]
      Info: invert
      LISTENER_CREATED 10.0.2.1:10100     [FAIL]
Expected value for 'family': '0', got '2'.
Expected value for 'saddr': '0', got '10.0.2.1'.
MPTcpExtPortAdd                 1                  0.0
MPTcpExtMPJoinPortSynAckRx      1                  0.0
MPTcpExtRmAddr                  1                  0.0
... ...
      LISTENER_CLOSED  10.0.2.1:10100     [FAIL]
Expected value for 'family': '0', got '2'.
Expected value for 'saddr': '0', got '10.0.2.1'.
... ...
not ok 3 - mptcp_join: remove single address with port

Thanks,
-Geliang

> While waiting for your reply to this question ↑, I just applied these
> patches in our tree (feat. for net-next), so I can check if we can
> already send them to netdev today or tomorrow:
> 
> New patches for t/upstream:
> - a472412db36f: selftests: mptcp: call test_fail without argument
> - b4d6c3097bd0: selftests: mptcp: extract mptcp_lib_check_expected
> - f826a35f7b2d: selftests: mptcp: print_test out of verify_listener_events
> - f469a988b798: selftests: mptcp: add mptcp_lib_verify_listener_events
> - 0f5aa3b047a7: selftests: mptcp: declare event macros in mptcp_lib
> - 31fffc8fa3b8: selftests: mptcp: use KSFT_SKIP/KSFT_PASS/KSFT_FAIL
> - 4913857b325c: selftests: mptcp: join: use += operator to append strings
> - Results: 2d8b9fa0983b..2c35e2ddd1b1 (export)
> 
> Tests are now in progress:
> 
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20240308T121027
> 
> Cheers,
> Matt
> -- 
> Sponsored by the NGI0 Core fund.
>