diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index 52ce059a5fd..b91e457791e 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -315,9 +315,15 @@ class YamlInterpreter(object):
         try:
             code = compile(statements, self.filename, 'exec')
             eval(code, code_context)
+        except AssertionError, e:
+            msg = 'Assertion "%s" FAILED in Python code.'
+            args = (python.name,)
+            self._log_assert_failure(python.severity, msg, *args)
+            return
         except Exception, e:
-            raise YamlImportException(e)
-        # TODO log success/failure
+            raise YamlImportAbortion(e)
+        else:
+            self.assert_report.record(True, python.severity)
     
     def process_workflow(self, node):
         workflow, values = node.items()[0]