commit 111fc504645e764317d798bd065187cb46e97020
author YPZhang <yunpeng@onlab.us> Thu May 12 23:30:10 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu May 12 23:30:10 2016 +0000
tree f984f84aecaba71dcccb29dd78ccd6d2d872400f
parent b5f46a24fd9acc61352084fc6ca66bb82c301a89
parent e96a30683896a95629116c04fe96b5c5a5a00ec1

Merge "Hotfix again..."

TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py

diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index dff2a22..6aee29e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -476,14 +476,9 @@
                     # If some intents are not installed, grep the previous flows list, and finished this test case
                     main.log.warn( "Some intens did not install" )
                     main.log.info("Total Intents: {}".format( totalIntents) )
-                    temp = 0
-                    totalFlows = 0
-                    if temp < totalFlows:
-                        temp = totalFlows
-                    else:
-                        totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
                     break
-                    # We don't want to check flows if intents not installed, because onos will drop flows
+
+        totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
         del main.scale[0]
         utilities.assert_equals( expect = main.TRUE,
                                  actual = intentsState,

TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py

diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py b/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
index 3c35012..7e6753e 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntentsWithFlowObj/SCPFscalingMaxIntentsWithFlowObj.py
@@ -478,14 +478,9 @@
                     # If some intents are not installed, grep the previous flows list, and finished this test case
                     main.log.warn( "Some intens did not install" )
                     main.log.info("Total Intents: {}".format( totalIntents) )
-                    temp = 0
-                    totalFlows = 0
-                    if temp < totalFlows:
-                        temp = totalFlows
-                    else:
-                        totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
                     break
-                    # We don't want to check flows if intents not installed, because onos will drop flows
+
+        totalFlows = main.CLIs[0].getTotalFlowsNum(timeout=600, noExit=True)
         del main.scale[0]
         utilities.assert_equals( expect = main.TRUE,
                                  actual = intentsState,