[robotframework] r3527 committed - Fixed error handling.

[robotframework]

Revision: 3527
Author: jprantan
Date: Wed May 26 02:05:32 2010
Log: Fixed error handling.
http://code.google.com/p/robotframework/source/detail?r=3527
Modified:
 /trunk/src/robot/running/model.py

=======================================
--- /trunk/src/robot/running/model.py   Wed May 26 02:04:27 2010
+++ /trunk/src/robot/running/model.py   Wed May 26 02:05:32 2010
@@ -47,17 +47,20 @@
     return RunnableTestSuite(_parse_suite(datasources[0], include_suites))

 def _parse_suite(path, include_suites):
-    if os.path.isdir(path):
-        return TestDataDirectory(source=path,  
include_suites=include_suites)
-    return TestCaseFile(source=path)
+    try:
+        if os.path.isdir(path):
+            return TestDataDirectory(source=path,  
include_suites=include_suites)
+        return TestCaseFile(source=path)
+    except DataError, err:
+        raise DataError("Parsing '%s' failed: %s" % (path, unicode(err)))

 def _get_multisource_suite(datasources, include_suites):
     suitedatas = []
     for datasource in datasources:
         try:
             suitedatas.append(_parse_suite(datasource, include_suites))
-        except DataError:
-            pass
+        except DataError, err:
+            LOGGER.info(err)
     suite = RunnableMultiTestSuite(suitedatas)
     if suite.get_test_count() == 0:
         raise DataError("Data sources %s contain no test cases."