commit db645ed1505d1b0bc88ca192cbb9cba9149d4ce0
author Jon Hall <jhall@onlab.us> Tue Mar 08 17:44:50 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 08 17:44:50 2016 +0000
tree 45d34dd0816a23690ea758358aeeda4dffa13568
parent b929323ac2dd9032a9ba70621adc0ecdbfd755b1
parent ea734be4efa695a515bbb01cf2587119b99012a9

Merge "Revert "Add workaround for onos not respawning""

TestON/tests/HAclusterRestart/HAclusterRestart.py

diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 835633e..4e7ac23 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -1739,10 +1739,6 @@
         utilities.assert_equals( expect=main.TRUE, actual=killResults,
                                  onpass="ONOS nodes killed",
                                  onfail="ONOS kill unsuccessful" )
-        # FIXME: Remove once ONOS-4117 is fixed
-        time.sleep(1)
-        for node in main.nodes:
-            main.ONOSbench.onosStart( node.ip_address )
 
         main.step( "Checking if ONOS is up yet" )
         for i in range( 2 ):

TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py

diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index dda9b26..3ab5072 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -1200,9 +1200,6 @@
 
         main.step( "Killing ONOS processes" )
         killResult = main.ONOSbench.onosKill( main.nodes[0].ip_address )
-        # FIXME: Remove once ONOS-4117 is fixed
-        time.sleep(1)
-        main.ONOSbench.onosStart( main.nodes[0].ip_address )
         start = time.time()
         utilities.assert_equals( expect=main.TRUE, actual=killResult,
                                  onpass="ONOS Killed",