Setting standard mininet timeout + fixing hosttracker suite

Change-Id: If984050884729bb07af29f8f5a9022a6cb542064
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
(cherry picked from commit dc18172d676204c6b388355231a86092251e12c6)

diff --git a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt b/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt
index 362257c157967fa05716e85263ac91ff74a3026e..033a6cca3d6b710247ec4f6b4037a2e777c16c87 100644 (file)
--- 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 35c41af88d05eb970a4751dab0712c1855a0723e..8bf7a108ee988a769acefe04a989a0660d74376f 100644 (file)
--- 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 4f1658fd2b4fff4e4e4fbee52ee6280968164081..bb8e7aa880a5ac185be97ec9d3dfcff0b49039e6 100644 (file)
--- 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 1aa62b2da4c3c9c05af3b48a374c43bacedca9f0..1aeeb514f3056290dfc312a606a0958001823583 100644 (file)
--- 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    >