Fixed a problem in driver
- checkFlowsStates will return False if flows return None
Change-Id: Ia0cc58b9aafe842eacef9426bbe7d8db658b0f31
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 1235353..6443467 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -2323,7 +2323,12 @@
statesCount = [0, 0, 0, 0]
for s in states:
rawFlows = self.flows( state=s, timeout = timeout )
- checkedStates.append( json.loads( rawFlows ) )
+ if rawFlows:
+ # if we didn't get flows or flows function return None, we should return
+ # main.Flase
+ checkedStates.append( json.loads( rawFlows ) )
+ else:
+ return main.FALSE
for i in range( len( states ) ):
for c in checkedStates[i]:
try:
@@ -2343,6 +2348,10 @@
except ( TypeError, ValueError ):
main.log.exception( "{}: Object not as expected: {!r}".format( self.name, rawFlows ) )
return None
+
+ except AssertionError:
+ main.log.exception( "" )
+ return None
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )