diff mbox

[ovs-dev,patch_v2,1/2] System-tests: Allow SNAT address variability retries.

Message ID 1500580963-130560-1-git-send-email-dlu998@gmail.com
State Accepted
Headers show

Commit Message

Darrell Ball July 20, 2017, 8:02 p.m. UTC 
Three of the SNAT tests allow for wget retries, which occasionally
happen.  However, these tests did not allow for SNAT address
variability for the retries, which is now tolerated.

Signed-off-by: Darrell Ball <dlu998@gmail.com>
---
 tests/system-traffic.at | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Joe Stringer July 21, 2017, 11:49 p.m. UTC | #1 
On 20 July 2017 at 13:02, Darrell Ball <dlu998@gmail.com> wrote:
> Three of the SNAT tests allow for wget retries, which occasionally
> happen.  However, these tests did not allow for SNAT address
> variability for the retries, which is now tolerated.
>
> Signed-off-by: Darrell Ball <dlu998@gmail.com>

Thanks, applied to master.
diff mbox

Patch

diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index b2393f5..1ebf928 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -2678,7 +2678,7 @@  dnl HTTP requests from p0->p1 should work fine.
 OVS_START_L7([at_ns1], [http])
 NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
 
-AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
 tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
 ])
 
@@ -2777,7 +2777,7 @@  dnl HTTP requests from p0->p1 should work fine.
 OVS_START_L7([at_ns1], [http])
 NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
 
-AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
 tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
 ])
 
@@ -2830,7 +2830,7 @@  dnl HTTP requests from p0->p1 should work fine.
 OVS_START_L7([at_ns1], [http])
 NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
 
-AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
 tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
 ])