netdev - Re: [PATCH iproute2] testsuite: ss: Fix spacing in expected output for ssfilter.t

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20181110214844.GL6440@orbyte.nwl.cc>
Date:   Sat, 10 Nov 2018 22:48:44 +0100
From:   Phil Sutter <phil@....cc>
To:     Stefano Brivio <sbrivio@...hat.com>
Cc:     Stephen Hemminger <stephen@...workplumber.org>,
        "Yoann P." <yoann.p.public@...il.com>, netdev@...r.kernel.org
Subject: Re: [PATCH iproute2] testsuite: ss: Fix spacing in expected output
 for ssfilter.t

Hi Stefano,

On Sat, Nov 10, 2018 at 10:21:59AM +0100, Stefano Brivio wrote:
> Since commit 00240899ec0b ("ss: Actually print left delimiter for
> columns") changes spacing in ss output, we also need to adjust for that in
> the ss filter test.
> 
> Fixes: 00240899ec0b ("ss: Actually print left delimiter for columns")
> Signed-off-by: Stefano Brivio <sbrivio@...hat.com>
> ---
>  testsuite/tests/ss/ssfilter.t | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/testsuite/tests/ss/ssfilter.t b/testsuite/tests/ss/ssfilter.t
> index e74f1765cb72..3091054f2892 100755
> --- a/testsuite/tests/ss/ssfilter.t
> +++ b/testsuite/tests/ss/ssfilter.t
> @@ -12,37 +12,37 @@ export TCPDIAG_FILE="$(dirname $0)/ss1.dump"
>  ts_log "[Testing ssfilter]"
>  
>  ts_ss "$0" "Match dport = 22" -Htna dport = 22
> -test_on "ESTAB    0           0                 10.0.0.1:36266           10.0.0.1:22"
> +test_on "ESTAB     0           0                10.0.0.1:36266           10.0.0.1:22"

How about using a regular expression ('test_on' calls grep with '-E')?
E.g. this instead of the above:

| test_on "ESTAB *0 *0 *10.0.0.1:36266 *10.0.0.1:22"

Note that I didn't test this change, just made sure 'grep -E' recognizes
' *' as expected.

Cheers, Phil