* iproute2 regression test now failing after merge
@ 2020-01-29 14:16 Stephen Hemminger
2020-01-29 22:18 ` [PATCH net-next] ss: fix tests to reflect compact output Peter Júnoš
2020-01-29 22:33 ` [PATCH net] " Peter Junos
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Hemminger @ 2020-01-29 14:16 UTC (permalink / raw)
To: Peter Junos, David Ahern; +Cc: netdev
I merged iproute2-next into iproute2 and noticed that the regression test for ss
is now failing.
$ make check
Removing results dir ...
Running bridge/vlan/tunnelshow.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/netns/set_nsid_batch.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/netns/set_nsid.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/link/show_dev_wo_vf_rate.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/link/add_type_xfrm.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/link/new_link.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/tunnel/add_tunnel.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ip/route/add_default_route.t [iproute2-this/4.19.0-6-amd64]: PASS
Running ss/ssfilter.t [iproute2-this/4.19.0-6-amd64]: FAILED
Bisected it down to:
commit c4f58629945898722ad9078e0f407c96f1ec7d2b
Author: Peter Junos <petoju@gmail.com>
Date: Thu Dec 26 14:07:09 2019 +0100
ss: use compact output for undetected screen width
This commit is fine, the tests just need to be updated.m
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH net-next] ss: fix tests to reflect compact output
2020-01-29 14:16 iproute2 regression test now failing after merge Stephen Hemminger
@ 2020-01-29 22:18 ` Peter Júnoš
2020-01-29 22:33 ` [PATCH net] " Peter Junos
1 sibling, 0 replies; 3+ messages in thread
From: Peter Júnoš @ 2020-01-29 22:18 UTC (permalink / raw)
To: netdev, stephen; +Cc: dsahern, petoju
This fixes broken tests in c4f58629945898722ad9078e0f407c96f1ec7d2b
It also escapes stars as grep is used and more bugs could sneak under
the radar with the previous solution.
---
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 3091054f..4c2315ca 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"
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"
ts_ss "$0" "Match (dport)" -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"
ts_ss "$0" "Match src = 0.0.0.0" -Htna src = 0.0.0.0
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src 0.0.0.0" -Htna src 0.0.0.0
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src sport" -Htna src 0.0.0.0 sport = 22
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src and sport" -Htna src 0.0.0.0 and sport = 22
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src and sport and dport" -Htna src 10.0.0.1 and sport = 22 and dport = 50312
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match src and sport and (dport)" -Htna 'src 10.0.0.1 and sport = 22 and ( dport = 50312 )'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match src and (sport and dport)" -Htna 'src 10.0.0.1 and ( sport = 22 and dport = 50312 )'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match (src and sport) and dport" -Htna '( src 10.0.0.1 and sport = 22 ) and dport = 50312'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match (src or src) and dst" -Htna '( src 0.0.0.0 or src 10.0.0.1 ) and dst 10.0.0.2'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH net] ss: fix tests to reflect compact output
2020-01-29 14:16 iproute2 regression test now failing after merge Stephen Hemminger
2020-01-29 22:18 ` [PATCH net-next] ss: fix tests to reflect compact output Peter Júnoš
@ 2020-01-29 22:33 ` Peter Junos
1 sibling, 0 replies; 3+ messages in thread
From: Peter Junos @ 2020-01-29 22:33 UTC (permalink / raw)
To: stephen; +Cc: petoju, dsahern, netdev
This fixes broken tests in commit c4f5862994589 ("ss: use compact output
for undetected screen width")
It also escapes stars as grep is used and more bugs could sneak under
the radar with the previous solution.
Signed-off-by: Peter Junos <petoju@gmail.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 3091054f..4c2315ca 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"
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"
ts_ss "$0" "Match (dport)" -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"
ts_ss "$0" "Match src = 0.0.0.0" -Htna src = 0.0.0.0
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src 0.0.0.0" -Htna src 0.0.0.0
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src sport" -Htna src 0.0.0.0 sport = 22
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src and sport" -Htna src 0.0.0.0 and sport = 22
-test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:*"
+test_on "LISTEN 0 128 0.0.0.0:22 0.0.0.0:\*"
ts_ss "$0" "Match src and sport and dport" -Htna src 10.0.0.1 and sport = 22 and dport = 50312
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match src and sport and (dport)" -Htna 'src 10.0.0.1 and sport = 22 and ( dport = 50312 )'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match src and (sport and dport)" -Htna 'src 10.0.0.1 and ( sport = 22 and dport = 50312 )'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match (src and sport) and dport" -Htna '( src 10.0.0.1 and sport = 22 ) and dport = 50312'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
ts_ss "$0" "Match (src or src) and dst" -Htna '( src 0.0.0.0 or src 10.0.0.1 ) and dst 10.0.0.2'
-test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
+test_on "ESTAB 0 0 10.0.0.1:22 10.0.0.2:50312"
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-29 22:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-29 14:16 iproute2 regression test now failing after merge Stephen Hemminger
2020-01-29 22:18 ` [PATCH net-next] ss: fix tests to reflect compact output Peter Júnoš
2020-01-29 22:33 ` [PATCH net] " Peter Junos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).