APPLIED[G]: [F][G][OEM-5.6][Unstable][SRU][PATCH 1/1] selftests/net: improve descriptions for XFAIL cases in psock_snd.sh

Kleber Souza kleber.souza at canonical.com
Tue Oct 27 10:30:33 UTC 2020


On 16.10.20 09:15, Po-Hsu Lin wrote:
> BugLink: https://bugs.launchpad.net/bugs/1900088
> 
> Before changing this it's a bit confusing to read test output:
>    raw csum_off with bad offset (fails)
>    ./psock_snd: write: Invalid argument
> 
> Change "fails" in the test case description to "expected to fail", so
> that the test output can be more understandable.
> 
> Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
> Signed-off-by: David S. Miller <davem at davemloft.net>
> (cherry picked from commit 30ae801746ea0e099246318d373691a9e3238d40)
> Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>

Applied to groovy/linux.

Thanks,
Kleber

> ---
>   tools/testing/selftests/net/psock_snd.sh | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/psock_snd.sh b/tools/testing/selftests/net/psock_snd.sh
> index 6331d91..170be65 100755
> --- a/tools/testing/selftests/net/psock_snd.sh
> +++ b/tools/testing/selftests/net/psock_snd.sh
> @@ -45,7 +45,7 @@ echo "raw vnet hdr"
>   echo "raw csum_off"
>   ./in_netns.sh ./psock_snd -v -c
>   
> -echo "raw csum_off with bad offset (fails)"
> +echo "raw csum_off with bad offset (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -v -c -C)
>   
>   
> @@ -57,7 +57,7 @@ echo "raw min size"
>   echo "raw mtu size"
>   ./in_netns.sh ./psock_snd -l "${mss}"
>   
> -echo "raw mtu size + 1 (fails)"
> +echo "raw mtu size + 1 (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -l "${mss_exceeds}")
>   
>   # fails due to ARPHRD_ETHER check in packet_extra_vlan_len_allowed
> @@ -65,19 +65,19 @@ echo "raw mtu size + 1 (fails)"
>   # echo "raw vlan mtu size"
>   # ./in_netns.sh ./psock_snd -V -l "${mss}"
>   
> -echo "raw vlan mtu size + 1 (fails)"
> +echo "raw vlan mtu size + 1 (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -V -l "${mss_exceeds}")
>   
>   echo "dgram mtu size"
>   ./in_netns.sh ./psock_snd -d -l "${mss}"
>   
> -echo "dgram mtu size + 1 (fails)"
> +echo "dgram mtu size + 1 (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -d -l "${mss_exceeds}")
>   
> -echo "raw truncate hlen (fails: does not arrive)"
> +echo "raw truncate hlen (expected to fail: does not arrive)"
>   (! ./in_netns.sh ./psock_snd -t "$((${vnet_hlen} + ${eth_hlen}))")
>   
> -echo "raw truncate hlen - 1 (fails: EINVAL)"
> +echo "raw truncate hlen - 1 (expected to fail: EINVAL)"
>   (! ./in_netns.sh ./psock_snd -t "$((${vnet_hlen} + ${eth_hlen} - 1))")
>   
>   
> @@ -86,13 +86,13 @@ echo "raw truncate hlen - 1 (fails: EINVAL)"
>   echo "raw gso min size"
>   ./in_netns.sh ./psock_snd -v -c -g -l "${mss_exceeds}"
>   
> -echo "raw gso min size - 1 (fails)"
> +echo "raw gso min size - 1 (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -v -c -g -l "${mss}")
>   
>   echo "raw gso max size"
>   ./in_netns.sh ./psock_snd -v -c -g -l "${max_mss}"
>   
> -echo "raw gso max size + 1 (fails)"
> +echo "raw gso max size + 1 (expected to fail)"
>   (! ./in_netns.sh ./psock_snd -v -c -g -l "${max_mss_exceeds}")
>   
>   echo "OK. All tests passed"
> 




More information about the kernel-team mailing list