lib: ltemplate - fix handling of CallOnFail (take 2)

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/tests/topotests/lib/ltemplate.py b/tests/topotests/lib/ltemplate.py
index e1d7750a07ecb8b57379febef9731107ab279df6..c112235fc0146c380b04b07335c87082f6ee217b 100644 (file)
--- a/tests/topotests/lib/ltemplate.py
+++ b/tests/topotests/lib/ltemplate.py
@@ -122,7 +122,9 @@ def ltemplateTest(script, SkipIfFailed=True, CallOnFail=None, CheckFuncStr=None)
         if check != True:
             pytest.skip("Check function '"+CheckFuncStr+"' returned: " + check)
 
-    luInclude(script, eval(CallOnFail))
+    if CallOnFail != None:
+        CallOnFail = eval(CallOnFail)
+    luInclude(script, CallOnFail)
     numFail = luNumFail() - numEntry
     if numFail > 0:
         luShowFail()