Merge "Replace ONOSJVMHeap with ONOSJAVAOPTS"
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 2b17d66..e47d34d 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1435,6 +1435,8 @@
i = self.handle.expect( [ self.prompt, pexpect.TIMEOUT, "Password:" ], timeout )
if i == 0:
main.log.info( self.name + ": " + node + " is up" )
+ # FIXME: for now we sleep 5s for CLI to become ready
+ time.sleep( 5 )
return main.TRUE
elif i == 1 or i == 2:
# NOTE: since this function won't return until ONOS is ready,
diff --git a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
index 497bb9d..fa17b67 100644
--- a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
+++ b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
@@ -53,7 +53,7 @@
# Percent of data that can be invalid per sample size iteration.
# Any more than this will cause the test to fail and stop. Must be a float between 0 and 1.
- <failPercent>0.25</failPercent>
+ <failPercent>0.5</failPercent>
</TEST>
diff --git a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.py b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.py
index 700008b..b0dd227 100644
--- a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.py
+++ b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.py
@@ -220,7 +220,7 @@
main.log.warn( "Latency was NOT obtained from tshark successfully." )
validDataCheck = False
- if tsharkLatCheck:
+ if eventLatCheck and tsharkLatCheck:
main.log.info( "instanceDeactivated: " + str( instanceDeactivated ) )
main.log.info( "masterChanged: " + str( masterChanged ) )
main.log.info( "roleRequestLat: " + str( roleRequestLat ) )
@@ -271,8 +271,8 @@
main.log.info( "Checking ONOS nodes." )
nodeResults = utilities.retry( main.Cluster.nodesCheck,
False,
- sleep=1,
- attempts=3 )
+ sleep=5,
+ attempts=50 )
if not nodeResults:
main.log.error( "Nodes check NOT successful." )