From 09f574a8268cf318e88134c04f8e60e7282cde7c Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Thu, 22 Jan 2015 01:08:23 -0800 Subject: [PATCH] Setting standard mininet timeout + fixing hosttracker suite Change-Id: If984050884729bb07af29f8f5a9022a6cb542064 Signed-off-by: Luis Gomez (cherry picked from commit dc18172d676204c6b388355231a86092251e12c6) --- test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt | 2 +- test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt | 2 +- test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt | 4 ---- test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt b/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt index 362257c157..033a6cca3d 100644 --- a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt @@ -10,7 +10,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo=linear,3 --switch ** Keywords *** Start Suite Log Start mininet - Open Connection ${MININET} prompt=> timeout=20 + Open Connection ${MININET} prompt=> timeout=30 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > diff --git a/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt b/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt index 35c41af88d..8bf7a108ee 100644 --- a/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt @@ -10,7 +10,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo=linear,3 --switch ** Keywords *** Start Suite Log Start mininet - Open Connection ${MININET} prompt=> timeout=10 + Open Connection ${MININET} prompt=> timeout=30 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > diff --git a/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt b/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt index 4f1658fd2b..bb8e7aa880 100644 --- a/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt @@ -22,8 +22,4 @@ Start Suite Read Until mininet> Sleep 30 Stop Suite - Log Stop mininet - Read - Write exit - Read Until > Close Connection diff --git a/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt b/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt index 1aa62b2da4..1aeeb514f3 100644 --- a/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt @@ -11,7 +11,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --custom customtopo.py - ** Keywords *** Start Suite Log Start mininet - Open Connection ${MININET} prompt=> timeout=10 + Open Connection ${MININET} prompt=> timeout=30 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Read Until > -- 2.36.6