commit c0c0ee2e713389d0a3fa29d7c98cbd3f90543fce
author You Wang <you@opennetworking.org> Mon Jan 28 19:35:53 2019 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Mon Jan 28 19:35:53 2019 +0000
tree cb695b9c3a617d3e184487131e95ba1218d49560
parent a0cc14293cd7f993589410a67fcb0911bc7bba3f
parent 5f34c84b9c6097c9e22b5b6db5c954873df84bdd

Merge "Fix a bug of expect result for timeout" into onos-1.15

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 4804d5d..82bd41e 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -2589,6 +2589,7 @@
     def checkFlowCount( self, min=0, timeout=60 ):
         count = self.getTotalFlowsNum( timeout=timeout )
         count = int( count ) if count else 0
+        main.log.debug( "found {} flows".format( count ) )
         return count if ( count > min ) else False
 
     def checkFlowsState( self, isPENDING=True, timeout=60, noExit=False ):

TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index d9c350c..38e3e2f 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -368,9 +368,11 @@
                                  kwargs={ 'min': minFlowCount },
                                  attempts=10,
                                  sleep=sleep )
+        if count == main.FALSE:
+            count == main.Cluster.active( 0 ).CLI.checkFlowCount()
         utilities.assertEquals(
                 expect=True,
-                actual=( count > 0 ),
+                actual=( count > minFlowCount ),
                 onpass="Flow count looks correct: " + str( count ),
                 onfail="Flow count looks wrong: " + str( count ) )
 
@@ -419,11 +421,13 @@
                                  args=( dpid, minFlowCount ),
                                  attempts=5,
                                  sleep=sleep )
+        if count == main.FALSE:
+            count = main.Cluster.active( 0 ).CLI.checkFlowAddedCount( dpid )
         utilities.assertEquals(
             expect=True,
             actual=( count > minFlowCount ),
             onpass="Flow count looks correct: " + str( count ),
-            onfail="Flow count looks wrong. " )
+            onfail="Flow count looks wrong: " + str( count ) )
 
     @staticmethod
     def checkFlowEqualityByDpid( main, dpid, flowCount, sleep=10 ):
@@ -434,10 +438,11 @@
                                  args=( dpid, flowCount, False, 1 ),
                                  attempts=5,
                                  sleep=sleep )
-
+        if count == main.FALSE:
+            count = main.Cluster.active( 0 ).CLI.checkFlowAddedCount( dpid )
         utilities.assertEquals(
                 expect=True,
-                actual=( int( count ) == flowCount ),
+                actual=( count == flowCount ),
                 onpass="Flow count looks correct: " + str( count ) ,
                 onfail="Flow count looks wrong. found {},  should be {}.".format( count, flowCount ) )
 
@@ -450,7 +455,8 @@
                                  args=( dpid, groupCount, False, 1),
                                  attempts=5,
                                  sleep=sleep )
-
+        if count == main.FALSE:
+            count = main.Cluseter.active( 0 ).CLI.checkGroupAddedCount( dpid )
         utilities.assertEquals(
                 expect=True,
                 actual=( count == groupCount ),